Skip to content

Commit

Permalink
Network manager conformance fixes (project-chip#37018)
Browse files Browse the repository at this point in the history 
* Add changes to zap files

* Change revision of network manager
  • Loading branch information
@tersal
tersal authored Jan 10, 2025
1 parent a219ff7 commit 87f7c4c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 94 deletions.
8 changes: 4 additions & 4 deletions examples/network-manager-app/network-manager-common/network-manager-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@ provisional cluster ThreadNetworkDirectory = 1107 {
}

endpoint 0 {
device type ma_rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 3;


server cluster Descriptor {
Expand Down Expand Up @@ -1615,7 +1615,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}

server cluster GeneralCommissioning {
Expand All @@ -1628,7 +1628,7 @@ 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 ArmFailSafe;
handle command ArmFailSafeResponse;
Expand Down Expand Up @@ -1699,7 +1699,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 2;
ram attribute clusterRevision default = 3;
}

server cluster WiFiNetworkDiagnostics {
Expand Down
103 changes: 13 additions & 90 deletions examples/network-manager-app/network-manager-common/network-manager-app.zap
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 103,
"featureLevel": 104,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -41,18 +41,20 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
"name": "MA-rootdevice",
"deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
"name": "MA-rootdevice",
"deviceTypeOrder": 0
}
],
"deviceVersions": [
1
3
],
"deviceIdentifiers": [
22
Expand Down Expand Up @@ -892,7 +894,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -1135,7 +1137,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -1931,22 +1933,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand Down Expand Up @@ -1989,7 +1975,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -2287,7 +2273,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
"commands": [],
"attributes": [
{
"name": "GeneratedCommandList",
Expand Down Expand Up @@ -2976,14 +2961,16 @@
"code": 144,
"profileId": 259,
"label": "MA-network-infrastructure-manager",
"name": "MA-network-infrastructure-manager"
"name": "MA-network-infrastructure-manager",
"deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 144,
"profileId": 259,
"label": "MA-network-infrastructure-manager",
"name": "MA-network-infrastructure-manager"
"name": "MA-network-infrastructure-manager",
"deviceTypeOrder": 0
}
],
"deviceVersions": [
Expand Down Expand Up @@ -3100,22 +3087,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand Down Expand Up @@ -3257,22 +3228,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand Down Expand Up @@ -3502,22 +3457,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand Down Expand Up @@ -3691,22 +3630,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand Down

0 comments on commit 87f7c4c

Please sign in to comment.