Skip to content

Commit 5276088

Browse files
bzbarsky-applepull[bot]
bzbarsky-apple
authored and
pull[bot]
committed
Update ZAP to v2023.08.30-nightly. (#28988)
This fixes non-determinism in .zap files, so they will stop changing every time they are opened/closed. Fixes #28967
1 parent 05d4df4 commit 5276088

File tree

70 files changed

+552
-1400
lines changed

Some content is hidden

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

70 files changed

+552
-1400
lines changed

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap

+113-124
Large diffs are not rendered by default.

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

+2-29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 97,
2+
"featureLevel": 98,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -36,32 +36,25 @@
3636
"id": 1,
3737
"name": "MA-rootdevice",
3838
"deviceTypeRef": {
39-
"id": 3,
4039
"code": 17,
4140
"profileId": 259,
4241
"label": "MA-powersource",
4342
"name": "MA-powersource"
4443
},
4544
"deviceTypes": [
4645
{
47-
"id": 3,
4846
"code": 17,
4947
"profileId": 259,
5048
"label": "MA-powersource",
5149
"name": "MA-powersource"
5250
},
5351
{
54-
"id": 2,
5552
"code": 22,
5653
"profileId": 259,
5754
"label": "MA-rootdevice",
5855
"name": "MA-rootdevice"
5956
}
6057
],
61-
"deviceTypeRefs": [
62-
3,
63-
2
64-
],
6558
"deviceVersions": [
6659
1,
6760
1
@@ -10505,32 +10498,25 @@
1050510498
"id": 4,
1050610499
"name": "MA-onofflight",
1050710500
"deviceTypeRef": {
10508-
"id": 8,
1050910501
"code": 256,
1051010502
"profileId": 259,
1051110503
"label": "MA-onofflight",
1051210504
"name": "MA-onofflight"
1051310505
},
1051410506
"deviceTypes": [
1051510507
{
10516-
"id": 8,
1051710508
"code": 256,
1051810509
"profileId": 259,
1051910510
"label": "MA-onofflight",
1052010511
"name": "MA-onofflight"
1052110512
},
1052210513
{
10523-
"id": 3,
1052410514
"code": 17,
1052510515
"profileId": 259,
1052610516
"label": "MA-powersource",
1052710517
"name": "MA-powersource"
1052810518
}
1052910519
],
10530-
"deviceTypeRefs": [
10531-
8,
10532-
3
10533-
],
1053410520
"deviceVersions": [
1053510521
1,
1053610522
1
@@ -30606,32 +30592,25 @@
3060630592
"id": 3,
3060730593
"name": "MA-onofflight",
3060830594
"deviceTypeRef": {
30609-
"id": 8,
3061030595
"code": 256,
3061130596
"profileId": 259,
3061230597
"label": "MA-onofflight",
3061330598
"name": "MA-onofflight"
3061430599
},
3061530600
"deviceTypes": [
3061630601
{
30617-
"id": 8,
3061830602
"code": 256,
3061930603
"profileId": 259,
3062030604
"label": "MA-onofflight",
3062130605
"name": "MA-onofflight"
3062230606
},
3062330607
{
30624-
"id": 3,
3062530608
"code": 17,
3062630609
"profileId": 259,
3062730610
"label": "MA-powersource",
3062830611
"name": "MA-powersource"
3062930612
}
3063030613
],
30631-
"deviceTypeRefs": [
30632-
8,
30633-
3
30634-
],
3063530614
"deviceVersions": [
3063630615
1,
3063730616
1
@@ -34890,24 +34869,19 @@
3489034869
"id": 2,
3489134870
"name": "Anonymous Endpoint Type",
3489234871
"deviceTypeRef": {
34893-
"id": 53,
3489434872
"code": 61442,
3489534873
"profileId": 259,
3489634874
"label": "MA-secondary-network-commissioning",
3489734875
"name": "MA-secondary-network-commissioning"
3489834876
},
3489934877
"deviceTypes": [
3490034878
{
34901-
"id": 53,
3490234879
"code": 61442,
3490334880
"profileId": 259,
3490434881
"label": "MA-secondary-network-commissioning",
3490534882
"name": "MA-secondary-network-commissioning"
3490634883
}
3490734884
],
34908-
"deviceTypeRefs": [
34909-
53
34910-
],
3491134885
"deviceVersions": [
3491234886
1
3491334887
],
@@ -35418,6 +35392,5 @@
3541835392
"endpointId": 65534,
3541935393
"networkId": 0
3542035394
}
35421-
],
35422-
"log": []
35395+
]
3542335396
}

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

+6-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 97,
2+
"featureLevel": 98,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -33,35 +33,28 @@
3333
],
3434
"endpointTypes": [
3535
{
36-
"id": 2,
36+
"id": 1,
3737
"name": "MA-rootdevice",
3838
"deviceTypeRef": {
39-
"id": 3,
4039
"code": 17,
4140
"profileId": 259,
4241
"label": "MA-powersource",
4342
"name": "MA-powersource"
4443
},
4544
"deviceTypes": [
4645
{
47-
"id": 3,
4846
"code": 17,
4947
"profileId": 259,
5048
"label": "MA-powersource",
5149
"name": "MA-powersource"
5250
},
5351
{
54-
"id": 2,
5552
"code": 22,
5653
"profileId": 259,
5754
"label": "MA-rootdevice",
5855
"name": "MA-rootdevice"
5956
}
6057
],
61-
"deviceTypeRefs": [
62-
3,
63-
2
64-
],
6558
"deviceVersions": [
6659
1,
6760
1
@@ -9554,35 +9547,28 @@
95549547
]
95559548
},
95569549
{
9557-
"id": 1,
9550+
"id": 2,
95589551
"name": "MA-onofflight",
95599552
"deviceTypeRef": {
9560-
"id": 8,
95619553
"code": 256,
95629554
"profileId": 259,
95639555
"label": "MA-onofflight",
95649556
"name": "MA-onofflight"
95659557
},
95669558
"deviceTypes": [
95679559
{
9568-
"id": 8,
95699560
"code": 256,
95709561
"profileId": 259,
95719562
"label": "MA-onofflight",
95729563
"name": "MA-onofflight"
95739564
},
95749565
{
9575-
"id": 3,
95769566
"code": 17,
95779567
"profileId": 259,
95789568
"label": "MA-powersource",
95799569
"name": "MA-powersource"
95809570
}
95819571
],
9582-
"deviceTypeRefs": [
9583-
8,
9584-
3
9585-
],
95869572
"deviceVersions": [
95879573
1,
95889574
1
@@ -22799,35 +22785,28 @@
2279922785
]
2280022786
},
2280122787
{
22802-
"id": 4,
22788+
"id": 3,
2280322789
"name": "MA-onofflight",
2280422790
"deviceTypeRef": {
22805-
"id": 8,
2280622791
"code": 256,
2280722792
"profileId": 259,
2280822793
"label": "MA-onofflight",
2280922794
"name": "MA-onofflight"
2281022795
},
2281122796
"deviceTypes": [
2281222797
{
22813-
"id": 8,
2281422798
"code": 256,
2281522799
"profileId": 259,
2281622800
"label": "MA-onofflight",
2281722801
"name": "MA-onofflight"
2281822802
},
2281922803
{
22820-
"id": 3,
2282122804
"code": 17,
2282222805
"profileId": 259,
2282322806
"label": "MA-powersource",
2282422807
"name": "MA-powersource"
2282522808
}
2282622809
],
22827-
"deviceTypeRefs": [
22828-
8,
22829-
3
22830-
],
2283122810
"deviceVersions": [
2283222811
1,
2283322812
1
@@ -27083,27 +27062,22 @@
2708327062
]
2708427063
},
2708527064
{
27086-
"id": 3,
27065+
"id": 4,
2708727066
"name": "Anonymous Endpoint Type",
2708827067
"deviceTypeRef": {
27089-
"id": 53,
2709027068
"code": 61442,
2709127069
"profileId": 259,
2709227070
"label": "MA-secondary-network-commissioning",
2709327071
"name": "MA-secondary-network-commissioning"
2709427072
},
2709527073
"deviceTypes": [
2709627074
{
27097-
"id": 53,
2709827075
"code": 61442,
2709927076
"profileId": 259,
2710027077
"label": "MA-secondary-network-commissioning",
2710127078
"name": "MA-secondary-network-commissioning"
2710227079
}
2710327080
],
27104-
"deviceTypeRefs": [
27105-
53
27106-
],
2710727081
"deviceVersions": [
2710827082
1
2710927083
],
@@ -27614,6 +27588,5 @@
2761427588
"endpointId": 65534,
2761527589
"networkId": 0
2761627590
}
27617-
],
27618-
"log": []
27591+
]
2761927592
}

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

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 97,
2+
"featureLevel": 98,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -36,24 +36,19 @@
3636
"id": 1,
3737
"name": "MA-bridge",
3838
"deviceTypeRef": {
39-
"id": 2,
4039
"code": 22,
4140
"profileId": 259,
4241
"label": "MA-rootdevice",
4342
"name": "MA-rootdevice"
4443
},
4544
"deviceTypes": [
4645
{
47-
"id": 2,
4846
"code": 22,
4947
"profileId": 259,
5048
"label": "MA-rootdevice",
5149
"name": "MA-rootdevice"
5250
}
5351
],
54-
"deviceTypeRefs": [
55-
2
56-
],
5752
"deviceVersions": [
5853
1
5954
],
@@ -5047,24 +5042,19 @@
50475042
"id": 2,
50485043
"name": "Anonymous Endpoint Type",
50495044
"deviceTypeRef": {
5050-
"id": 6,
50515045
"code": 14,
50525046
"profileId": 259,
50535047
"label": "MA-aggregator",
50545048
"name": "MA-aggregator"
50555049
},
50565050
"deviceTypes": [
50575051
{
5058-
"id": 6,
50595052
"code": 14,
50605053
"profileId": 259,
50615054
"label": "MA-aggregator",
50625055
"name": "MA-aggregator"
50635056
}
50645057
],
5065-
"deviceTypeRefs": [
5066-
6
5067-
],
50685058
"deviceVersions": [
50695059
1
50705060
],
@@ -5806,24 +5796,19 @@
58065796
"id": 3,
58075797
"name": "MA-dimmablelight",
58085798
"deviceTypeRef": {
5809-
"id": 9,
58105799
"code": 257,
58115800
"profileId": 259,
58125801
"label": "MA-dimmablelight",
58135802
"name": "MA-dimmablelight"
58145803
},
58155804
"deviceTypes": [
58165805
{
5817-
"id": 9,
58185806
"code": 257,
58195807
"profileId": 259,
58205808
"label": "MA-dimmablelight",
58215809
"name": "MA-dimmablelight"
58225810
}
58235811
],
5824-
"deviceTypeRefs": [
5825-
9
5826-
],
58275812
"deviceVersions": [
58285813
1
58295814
],
@@ -7697,6 +7682,5 @@
76977682
"endpointId": 2,
76987683
"networkId": 0
76997684
}
7700-
],
7701-
"log": []
7685+
]
77027686
}

0 commit comments

Comments
 (0)