Skip to content

Commit 05ca534

Browse files
tehampsontehampson
committed
Merge branch 'master' into read-events-chip-repl-02-07-upload
2 parents a2e9235 + c7b1748 commit 05ca534

File tree

120 files changed

+23140
-2152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+23140
-2152
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+324-8
Large diffs are not rendered by default.

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+117-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 89,
2+
"featureLevel": 90,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -1136,6 +1136,15 @@
11361136
"maxInterval": 65534,
11371137
"reportableChange": 0
11381138
}
1139+
],
1140+
"events": [
1141+
{
1142+
"name": "AccessControlEntryChanged",
1143+
"code": 0,
1144+
"mfgCode": null,
1145+
"side": "server",
1146+
"included": 1
1147+
}
11391148
]
11401149
},
11411150
{
@@ -1524,6 +1533,15 @@
15241533
"maxInterval": 65344,
15251534
"reportableChange": 0
15261535
}
1536+
],
1537+
"events": [
1538+
{
1539+
"name": "StartUp",
1540+
"code": 0,
1541+
"mfgCode": null,
1542+
"side": "server",
1543+
"included": 1
1544+
}
15271545
]
15281546
},
15291547
{
@@ -1810,6 +1828,29 @@
18101828
"maxInterval": 65344,
18111829
"reportableChange": 0
18121830
}
1831+
],
1832+
"events": [
1833+
{
1834+
"name": "StateTransition",
1835+
"code": 0,
1836+
"mfgCode": null,
1837+
"side": "server",
1838+
"included": 1
1839+
},
1840+
{
1841+
"name": "VersionApplied",
1842+
"code": 1,
1843+
"mfgCode": null,
1844+
"side": "server",
1845+
"included": 1
1846+
},
1847+
{
1848+
"name": "DownloadError",
1849+
"code": 2,
1850+
"mfgCode": null,
1851+
"side": "server",
1852+
"included": 1
1853+
}
18131854
]
18141855
},
18151856
{
@@ -10242,6 +10283,22 @@
1024210283
"maxInterval": 65344,
1024310284
"reportableChange": 0
1024410285
}
10286+
],
10287+
"events": [
10288+
{
10289+
"name": "StateChanged",
10290+
"code": 0,
10291+
"mfgCode": null,
10292+
"side": "server",
10293+
"included": 1
10294+
},
10295+
{
10296+
"name": "ActionFailed",
10297+
"code": 1,
10298+
"mfgCode": null,
10299+
"side": "server",
10300+
"included": 1
10301+
}
1024510302
]
1024610303
},
1024710304
{
@@ -11882,6 +11939,15 @@
1188211939
"maxInterval": 65344,
1188311940
"reportableChange": 0
1188411941
}
11942+
],
11943+
"events": [
11944+
{
11945+
"name": "SwitchLatched",
11946+
"code": 0,
11947+
"mfgCode": null,
11948+
"side": "server",
11949+
"included": 1
11950+
}
1188511951
]
1188611952
},
1188711953
{
@@ -12200,6 +12266,15 @@
1220012266
"maxInterval": 65534,
1220112267
"reportableChange": 0
1220212268
}
12269+
],
12270+
"events": [
12271+
{
12272+
"name": "StateChange",
12273+
"code": 0,
12274+
"mfgCode": null,
12275+
"side": "server",
12276+
"included": 1
12277+
}
1220312278
]
1220412279
},
1220512280
{
@@ -13254,6 +13329,29 @@
1325413329
"maxInterval": 65344,
1325513330
"reportableChange": 0
1325613331
}
13332+
],
13333+
"events": [
13334+
{
13335+
"name": "DoorLockAlarm",
13336+
"code": 0,
13337+
"mfgCode": null,
13338+
"side": "server",
13339+
"included": 1
13340+
},
13341+
{
13342+
"name": "LockOperation",
13343+
"code": 2,
13344+
"mfgCode": null,
13345+
"side": "server",
13346+
"included": 1
13347+
},
13348+
{
13349+
"name": "LockOperationError",
13350+
"code": 3,
13351+
"mfgCode": null,
13352+
"side": "server",
13353+
"included": 1
13354+
}
1325713355
]
1325813356
},
1325913357
{
@@ -20896,6 +20994,22 @@
2089620994
"maxInterval": 65344,
2089720995
"reportableChange": 0
2089820996
}
20997+
],
20998+
"events": [
20999+
{
21000+
"name": "TestEvent",
21001+
"code": 1,
21002+
"mfgCode": null,
21003+
"side": "server",
21004+
"included": 1
21005+
},
21006+
{
21007+
"name": "TestFabricScopedEvent",
21008+
"code": 2,
21009+
"mfgCode": null,
21010+
"side": "server",
21011+
"included": 1
21012+
}
2089921013
]
2090021014
}
2090121015
]
@@ -24872,5 +24986,6 @@
2487224986
"endpointVersion": 1,
2487324987
"deviceIdentifier": 61442
2487424988
}
24875-
]
24989+
],
24990+
"log": []
2487624991
}

‎examples/bridge-app/bridge-common/bridge-app.zap

+129-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 89,
2+
"featureLevel": 90,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -444,6 +444,15 @@
444444
"maxInterval": 65534,
445445
"reportableChange": 0
446446
}
447+
],
448+
"events": [
449+
{
450+
"name": "AccessControlEntryChanged",
451+
"code": 0,
452+
"mfgCode": null,
453+
"side": "server",
454+
"included": 1
455+
}
447456
]
448457
},
449458
{
@@ -896,6 +905,29 @@
896905
"maxInterval": 65344,
897906
"reportableChange": 0
898907
}
908+
],
909+
"events": [
910+
{
911+
"name": "StartUp",
912+
"code": 0,
913+
"mfgCode": null,
914+
"side": "server",
915+
"included": 1
916+
},
917+
{
918+
"name": "ShutDown",
919+
"code": 1,
920+
"mfgCode": null,
921+
"side": "server",
922+
"included": 1
923+
},
924+
{
925+
"name": "Leave",
926+
"code": 2,
927+
"mfgCode": null,
928+
"side": "server",
929+
"included": 1
930+
}
899931
]
900932
},
901933
{
@@ -2336,6 +2368,36 @@
23362368
"maxInterval": 65344,
23372369
"reportableChange": 0
23382370
}
2371+
],
2372+
"events": [
2373+
{
2374+
"name": "HardwareFaultChange",
2375+
"code": 0,
2376+
"mfgCode": null,
2377+
"side": "server",
2378+
"included": 1
2379+
},
2380+
{
2381+
"name": "RadioFaultChange",
2382+
"code": 1,
2383+
"mfgCode": null,
2384+
"side": "server",
2385+
"included": 1
2386+
},
2387+
{
2388+
"name": "NetworkFaultChange",
2389+
"code": 2,
2390+
"mfgCode": null,
2391+
"side": "server",
2392+
"included": 1
2393+
},
2394+
{
2395+
"name": "BootReason",
2396+
"code": 3,
2397+
"mfgCode": null,
2398+
"side": "server",
2399+
"included": 1
2400+
}
23392401
]
23402402
},
23412403
{
@@ -2478,6 +2540,15 @@
24782540
"maxInterval": 65344,
24792541
"reportableChange": 0
24802542
}
2543+
],
2544+
"events": [
2545+
{
2546+
"name": "SoftwareFault",
2547+
"code": 0,
2548+
"mfgCode": null,
2549+
"side": "server",
2550+
"included": 1
2551+
}
24812552
]
24822553
},
24832554
{
@@ -3528,6 +3599,22 @@
35283599
"maxInterval": 65344,
35293600
"reportableChange": 0
35303601
}
3602+
],
3603+
"events": [
3604+
{
3605+
"name": "ConnectionStatus",
3606+
"code": 0,
3607+
"mfgCode": null,
3608+
"side": "server",
3609+
"included": 1
3610+
},
3611+
{
3612+
"name": "NetworkFaultChange",
3613+
"code": 1,
3614+
"mfgCode": null,
3615+
"side": "server",
3616+
"included": 1
3617+
}
35313618
]
35323619
},
35333620
{
@@ -3804,6 +3891,29 @@
38043891
"maxInterval": 65344,
38053892
"reportableChange": 0
38063893
}
3894+
],
3895+
"events": [
3896+
{
3897+
"name": "Disconnection",
3898+
"code": 0,
3899+
"mfgCode": null,
3900+
"side": "server",
3901+
"included": 1
3902+
},
3903+
{
3904+
"name": "AssociationFailure",
3905+
"code": 1,
3906+
"mfgCode": null,
3907+
"side": "server",
3908+
"included": 1
3909+
},
3910+
{
3911+
"name": "ConnectionStatus",
3912+
"code": 2,
3913+
"mfgCode": null,
3914+
"side": "server",
3915+
"included": 1
3916+
}
38073917
]
38083918
},
38093919
{
@@ -5664,6 +5774,22 @@
56645774
"maxInterval": 65534,
56655775
"reportableChange": 0
56665776
}
5777+
],
5778+
"events": [
5779+
{
5780+
"name": "StateChanged",
5781+
"code": 0,
5782+
"mfgCode": null,
5783+
"side": "server",
5784+
"included": 1
5785+
},
5786+
{
5787+
"name": "ActionFailed",
5788+
"code": 1,
5789+
"mfgCode": null,
5790+
"side": "server",
5791+
"included": 1
5792+
}
56675793
]
56685794
}
56695795
]
@@ -7543,5 +7669,6 @@
75437669
"endpointVersion": 1,
75447670
"deviceIdentifier": 257
75457671
}
7546-
]
7672+
],
7673+
"log": []
75477674
}

0 commit comments

Comments
 (0)