Skip to content

Commit

Permalink
Pull request project-chip#1579: Cherry-pick: Pull request project-chi…
Browse files Browse the repository at this point in the history
…p#1547: MATTER-3090 Update cluster revision for basic and diagnostic clusters

Merge in WMN_TOOLS/matter from cherry-pick/bridge-update-some-cluster-revision to silabs

Squashed commit of the following:

commit 74ddc940742f249eb08e2cba2e04928fb318d824
Author: Satya Naag Bollimpalli <[email protected]>
Date:   Tue Feb 6 15:02:08 2024 +0000

    Pull request project-chip#1547: MATTER-3090 Update cluster revision for basic and diagnostic clusters

    Merge in WMN_TOOLS/matter from bugfix/MATTER-3090-fix-cluster-revision-for-basic-and-diagnostic-cluster-umb to RC_2.3.0-1.3

    Squashed commit of the following:

    commit 4926130188be752e9e81ad0e56f5f320c89502ed
    Author: sabollim <[email protected]>
    Date:   Tue Feb 6 15:59:26 2024 +0530

        adding newly added attributes and command for new version of basic and daignostics clusters

    commit b2011c95f65a567ea2f045f898194341d2409e10
    Author: sabollim <[email protected]>
    Date:   Tue Feb 6 10:13:04 2024 +0530

        MATTER-3090 Update cluster revision for basic and diagnostic clusters
  • Loading branch information
jmartinez-silabs committed Mar 27, 2024
1 parent 56bb9c8 commit a7100c1
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ CHIP_ERROR BridgedDeviceBasicInfoAttributeAccess::Read(const ConcreteReadAttribu
}
case ClusterRevision::Id: {
// Update version if bridged-device-basic.xml version is changed
uint16_t revision = 1;
uint16_t revision = 3;
return aEncoder.Encode(revision);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1348,11 +1348,13 @@ endpoint 0 {
ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
callback attribute specificationVersion;
callback attribute maxPathsPerInvoke;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 2;
ram attribute clusterRevision default = 3;
}

server cluster LocalizationConfiguration {
Expand Down Expand Up @@ -1444,9 +1446,11 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

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 @@ -754,6 +754,38 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "SpecificationVersion",
"code": 21,
"mfgCode": null,
"side": "server",
"type": "int32u",
"included": 1,
"storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "MaxPathsPerInvoke",
"code": 22,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -828,7 +860,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -1669,6 +1701,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 @@ -1890,7 +1938,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down

0 comments on commit a7100c1

Please sign in to comment.