Skip to content

Commit

Permalink
Update ZAP to v2023.08.30-nightly. (#28988)
Browse files Browse the repository at this point in the history 
This fixes non-determinism in .zap files, so they will stop changing every time
they are opened/closed.

Fixes #28967
  • Loading branch information
@bzbarsky-apple
bzbarsky-apple authored Sep 1, 2023
1 parent f2ce180 commit 32bd913
Show file tree
Hide file tree
Showing 70 changed files with 552 additions and 1,400 deletions.
237 changes: 113 additions & 124 deletions examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
View file

Large diffs are not rendered by default.

31 changes: 2 additions & 29 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 97,
"featureLevel": 98,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -36,32 +36,25 @@
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
},
"deviceTypes": [
{
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
},
{
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
}
],
"deviceTypeRefs": [
3,
2
],
"deviceVersions": [
1,
1
Expand Down Expand Up @@ -10505,32 +10498,25 @@
"id": 4,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
"deviceTypes": [
{
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
}
],
"deviceTypeRefs": [
8,
3
],
"deviceVersions": [
1,
1
Expand Down Expand Up @@ -30606,32 +30592,25 @@
"id": 3,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
"deviceTypes": [
{
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
}
],
"deviceTypeRefs": [
8,
3
],
"deviceVersions": [
1,
1
Expand Down Expand Up @@ -34890,24 +34869,19 @@
"id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 53,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
"name": "MA-secondary-network-commissioning"
},
"deviceTypes": [
{
"id": 53,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
"name": "MA-secondary-network-commissioning"
}
],
"deviceTypeRefs": [
53
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -35418,6 +35392,5 @@
"endpointId": 65534,
"networkId": 0
}
],
"log": []
]
}
39 changes: 6 additions & 33 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 97,
"featureLevel": 98,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -33,35 +33,28 @@
],
"endpointTypes": [
{
"id": 2,
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
},
"deviceTypes": [
{
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
},
{
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
}
],
"deviceTypeRefs": [
3,
2
],
"deviceVersions": [
1,
1
Expand Down Expand Up @@ -9554,35 +9547,28 @@
]
},
{
"id": 1,
"id": 2,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
"deviceTypes": [
{
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
}
],
"deviceTypeRefs": [
8,
3
],
"deviceVersions": [
1,
1
Expand Down Expand Up @@ -22799,35 +22785,28 @@
]
},
{
"id": 4,
"id": 3,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
"deviceTypes": [
{
"id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
"id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
}
],
"deviceTypeRefs": [
8,
3
],
"deviceVersions": [
1,
1
Expand Down Expand Up @@ -27083,27 +27062,22 @@
]
},
{
"id": 3,
"id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 53,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
"name": "MA-secondary-network-commissioning"
},
"deviceTypes": [
{
"id": 53,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
"name": "MA-secondary-network-commissioning"
}
],
"deviceTypeRefs": [
53
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -27614,6 +27588,5 @@
"endpointId": 65534,
"networkId": 0
}
],
"log": []
]
}
20 changes: 2 additions & 18 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 97,
"featureLevel": 98,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -36,24 +36,19 @@
"id": 1,
"name": "MA-bridge",
"deviceTypeRef": {
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
},
"deviceTypes": [
{
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
}
],
"deviceTypeRefs": [
2
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -5047,24 +5042,19 @@
"id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 6,
"code": 14,
"profileId": 259,
"label": "MA-aggregator",
"name": "MA-aggregator"
},
"deviceTypes": [
{
"id": 6,
"code": 14,
"profileId": 259,
"label": "MA-aggregator",
"name": "MA-aggregator"
}
],
"deviceTypeRefs": [
6
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -5806,24 +5796,19 @@
"id": 3,
"name": "MA-dimmablelight",
"deviceTypeRef": {
"id": 9,
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
"name": "MA-dimmablelight"
},
"deviceTypes": [
{
"id": 9,
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
"name": "MA-dimmablelight"
}
],
"deviceTypeRefs": [
9
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -7697,6 +7682,5 @@
"endpointId": 2,
"networkId": 0
}
],
"log": []
]
}
Loading

0 comments on commit 32bd913

Please sign in to comment.