Skip to content

Commit

Permalink
Add general diagnostics cluster Matter 1.3 XML changes (#30091)
Browse files Browse the repository at this point in the history
- Added TimeSnapshot command
- Added necessary comments about other changes needed
- Regenerated zap
- Put necessary scaffolding for TimeSnapshot command
- Updated TC-DGEN-1.1/TC-DGEN-2.1 tests to work with updated revision

Issue #30096
---------

Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
3 people authored and samryanuofl committed Jan 12, 2024
1 parent a2443c8 commit 1182756
Show file tree
Hide file tree
Showing 175 changed files with 2,839 additions and 177 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** Commands to trigger a Node to allow a new Administrator to commission it. */
Expand Down Expand Up @@ -1883,9 +1889,11 @@ endpoint 0 {
callback attribute activeNetworkFaults;
callback attribute testEventTriggersEnabled default = false;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 0x0001;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster AdministratorCommissioning {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1379,6 +1379,22 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshot",
"code": 1,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshotResponse",
"code": 2,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -1552,7 +1568,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0001",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** The Software Diagnostics Cluster provides 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. */
Expand Down Expand Up @@ -1886,9 +1892,11 @@ endpoint 0 {
callback attribute activeNetworkFaults;
callback attribute testEventTriggersEnabled default = false;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster SoftwareDiagnostics {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,22 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshot",
"code": 1,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshotResponse",
"code": 2,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -1500,7 +1516,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** The Software Diagnostics Cluster provides 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. */
Expand Down Expand Up @@ -5399,9 +5405,11 @@ endpoint 0 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster SoftwareDiagnostics {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2695,6 +2695,22 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshot",
"code": 1,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshotResponse",
"code": 2,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -2932,7 +2948,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,7 @@ server cluster GeneralDiagnostics = 51 {

readonly attribute NetworkInterface networkInterfaces[] = 0;
readonly attribute int16u rebootCount = 1;
readonly attribute int64u upTime = 2;
readonly attribute boolean testEventTriggersEnabled = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -1488,7 +1489,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** The Software Diagnostics Cluster provides 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. */
Expand Down Expand Up @@ -4189,15 +4196,18 @@ endpoint 0 {
server cluster GeneralDiagnostics {
callback attribute networkInterfaces;
callback attribute rebootCount default = 0x0000;
callback attribute upTime default = 0x0000000000000000;
callback attribute testEventTriggersEnabled;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster SoftwareDiagnostics {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2368,6 +2368,22 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshot",
"code": 1,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshotResponse",
"code": 2,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -2403,6 +2419,22 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "UpTime",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int64u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "TestEventTriggersEnabled",
"code": 8,
Expand Down Expand Up @@ -2509,7 +2541,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
10 changes: 9 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** The Software Diagnostics Cluster provides 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. */
Expand Down Expand Up @@ -1787,9 +1793,11 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster SoftwareDiagnostics {
Expand Down
18 changes: 17 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1797,6 +1797,22 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshot",
"code": 1,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshotResponse",
"code": 2,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -2018,7 +2034,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** The Software Diagnostics Cluster provides 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. */
Expand Down Expand Up @@ -1599,9 +1605,11 @@ endpoint 0 {
callback attribute activeNetworkFaults;
callback attribute testEventTriggersEnabled default = false;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 0x0001;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster SoftwareDiagnostics {
Expand Down
18 changes: 17 additions & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,22 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshot",
"code": 1,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TimeSnapshotResponse",
"code": 2,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -1472,7 +1488,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0001",
"defaultValue": "0x0002",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
Loading

0 comments on commit 1182756

Please sign in to comment.