Skip to content

Commit 87f7c4c

Browse files
tersaltersal
authoredJan 10, 2025
Network manager conformance fixes (project-chip#37018)
* Add changes to zap files * Change revision of network manager
1 parent a219ff7 commit 87f7c4c

File tree

2 files changed

+17
-94
lines changed

2 files changed

+17
-94
lines changed
 

‎examples/network-manager-app/network-manager-common/network-manager-app.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ provisional cluster ThreadNetworkDirectory = 1107 {
15491549
}
15501550

15511551
endpoint 0 {
1552-
device type ma_rootdevice = 22, version 1;
1552+
device type ma_rootdevice = 22, version 3;
15531553

15541554

15551555
server cluster Descriptor {
@@ -1615,7 +1615,7 @@ endpoint 0 {
16151615
callback attribute acceptedCommandList;
16161616
callback attribute attributeList;
16171617
ram attribute featureMap default = 0;
1618-
ram attribute clusterRevision default = 3;
1618+
ram attribute clusterRevision default = 4;
16191619
}
16201620

16211621
server cluster GeneralCommissioning {
@@ -1628,7 +1628,7 @@ endpoint 0 {
16281628
callback attribute acceptedCommandList;
16291629
callback attribute attributeList;
16301630
ram attribute featureMap default = 0;
1631-
ram attribute clusterRevision default = 1;
1631+
ram attribute clusterRevision default = 2;
16321632

16331633
handle command ArmFailSafe;
16341634
handle command ArmFailSafeResponse;
@@ -1699,7 +1699,7 @@ endpoint 0 {
16991699
callback attribute acceptedCommandList;
17001700
callback attribute attributeList;
17011701
ram attribute featureMap default = 0;
1702-
ram attribute clusterRevision default = 2;
1702+
ram attribute clusterRevision default = 3;
17031703
}
17041704

17051705
server cluster WiFiNetworkDiagnostics {

‎examples/network-manager-app/network-manager-common/network-manager-app.zap

+13-90
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 103,
3+
"featureLevel": 104,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -41,18 +41,20 @@
4141
"code": 22,
4242
"profileId": 259,
4343
"label": "MA-rootdevice",
44-
"name": "MA-rootdevice"
44+
"name": "MA-rootdevice",
45+
"deviceTypeOrder": 0
4546
},
4647
"deviceTypes": [
4748
{
4849
"code": 22,
4950
"profileId": 259,
5051
"label": "MA-rootdevice",
51-
"name": "MA-rootdevice"
52+
"name": "MA-rootdevice",
53+
"deviceTypeOrder": 0
5254
}
5355
],
5456
"deviceVersions": [
55-
1
57+
3
5658
],
5759
"deviceIdentifiers": [
5860
22
@@ -892,7 +894,7 @@
892894
"storageOption": "RAM",
893895
"singleton": 1,
894896
"bounded": 0,
895-
"defaultValue": "3",
897+
"defaultValue": "4",
896898
"reportable": 1,
897899
"minInterval": 0,
898900
"maxInterval": 65344,
@@ -1135,7 +1137,7 @@
11351137
"storageOption": "RAM",
11361138
"singleton": 0,
11371139
"bounded": 0,
1138-
"defaultValue": "1",
1140+
"defaultValue": "2",
11391141
"reportable": 1,
11401142
"minInterval": 0,
11411143
"maxInterval": 65344,
@@ -1931,22 +1933,6 @@
19311933
"maxInterval": 65534,
19321934
"reportableChange": 0
19331935
},
1934-
{
1935-
"name": "EventList",
1936-
"code": 65530,
1937-
"mfgCode": null,
1938-
"side": "server",
1939-
"type": "array",
1940-
"included": 1,
1941-
"storageOption": "External",
1942-
"singleton": 0,
1943-
"bounded": 0,
1944-
"defaultValue": null,
1945-
"reportable": 1,
1946-
"minInterval": 1,
1947-
"maxInterval": 65534,
1948-
"reportableChange": 0
1949-
},
19501936
{
19511937
"name": "AttributeList",
19521938
"code": 65531,
@@ -1989,7 +1975,7 @@
19891975
"storageOption": "RAM",
19901976
"singleton": 0,
19911977
"bounded": 0,
1992-
"defaultValue": "2",
1978+
"defaultValue": "3",
19931979
"reportable": 1,
19941980
"minInterval": 1,
19951981
"maxInterval": 65534,
@@ -2287,7 +2273,6 @@
22872273
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
22882274
"side": "server",
22892275
"enabled": 1,
2290-
"commands": [],
22912276
"attributes": [
22922277
{
22932278
"name": "GeneratedCommandList",
@@ -2976,14 +2961,16 @@
29762961
"code": 144,
29772962
"profileId": 259,
29782963
"label": "MA-network-infrastructure-manager",
2979-
"name": "MA-network-infrastructure-manager"
2964+
"name": "MA-network-infrastructure-manager",
2965+
"deviceTypeOrder": 0
29802966
},
29812967
"deviceTypes": [
29822968
{
29832969
"code": 144,
29842970
"profileId": 259,
29852971
"label": "MA-network-infrastructure-manager",
2986-
"name": "MA-network-infrastructure-manager"
2972+
"name": "MA-network-infrastructure-manager",
2973+
"deviceTypeOrder": 0
29872974
}
29882975
],
29892976
"deviceVersions": [
@@ -3100,22 +3087,6 @@
31003087
"maxInterval": 65534,
31013088
"reportableChange": 0
31023089
},
3103-
{
3104-
"name": "EventList",
3105-
"code": 65530,
3106-
"mfgCode": null,
3107-
"side": "server",
3108-
"type": "array",
3109-
"included": 1,
3110-
"storageOption": "External",
3111-
"singleton": 0,
3112-
"bounded": 0,
3113-
"defaultValue": null,
3114-
"reportable": 1,
3115-
"minInterval": 1,
3116-
"maxInterval": 65534,
3117-
"reportableChange": 0
3118-
},
31193090
{
31203091
"name": "AttributeList",
31213092
"code": 65531,
@@ -3257,22 +3228,6 @@
32573228
"maxInterval": 65534,
32583229
"reportableChange": 0
32593230
},
3260-
{
3261-
"name": "EventList",
3262-
"code": 65530,
3263-
"mfgCode": null,
3264-
"side": "server",
3265-
"type": "array",
3266-
"included": 1,
3267-
"storageOption": "External",
3268-
"singleton": 0,
3269-
"bounded": 0,
3270-
"defaultValue": null,
3271-
"reportable": 1,
3272-
"minInterval": 1,
3273-
"maxInterval": 65534,
3274-
"reportableChange": 0
3275-
},
32763231
{
32773232
"name": "AttributeList",
32783233
"code": 65531,
@@ -3502,22 +3457,6 @@
35023457
"maxInterval": 65534,
35033458
"reportableChange": 0
35043459
},
3505-
{
3506-
"name": "EventList",
3507-
"code": 65530,
3508-
"mfgCode": null,
3509-
"side": "server",
3510-
"type": "array",
3511-
"included": 1,
3512-
"storageOption": "External",
3513-
"singleton": 0,
3514-
"bounded": 0,
3515-
"defaultValue": null,
3516-
"reportable": 1,
3517-
"minInterval": 1,
3518-
"maxInterval": 65534,
3519-
"reportableChange": 0
3520-
},
35213460
{
35223461
"name": "AttributeList",
35233462
"code": 65531,
@@ -3691,22 +3630,6 @@
36913630
"maxInterval": 65534,
36923631
"reportableChange": 0
36933632
},
3694-
{
3695-
"name": "EventList",
3696-
"code": 65530,
3697-
"mfgCode": null,
3698-
"side": "server",
3699-
"type": "array",
3700-
"included": 1,
3701-
"storageOption": "External",
3702-
"singleton": 0,
3703-
"bounded": 0,
3704-
"defaultValue": null,
3705-
"reportable": 1,
3706-
"minInterval": 1,
3707-
"maxInterval": 65534,
3708-
"reportableChange": 0
3709-
},
37103633
{
37113634
"name": "AttributeList",
37123635
"code": 65531,

0 commit comments

Comments
 (0)