Skip to content

Commit

Permalink
Update ZAP to v2023.09.05-nightly. (#29095)
Browse files Browse the repository at this point in the history
This should fix UI issues around enabling/disabling events.

The .zap changes are from ZAP files that were last edited/generated with a
too-old version of ZAP (from before v2023.08.30-nightly).
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Dec 1, 2023
1 parent 97de7fe commit 3742211
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 70 deletions.
3 changes: 1 addition & 2 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -10833,6 +10833,5 @@
"endpointId": 1,
"networkId": 0
}
],
"log": []
]
}
3 changes: 1 addition & 2 deletions examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
Original file line number Diff line number Diff line change
Expand Up @@ -11081,6 +11081,5 @@
"endpointId": 1,
"networkId": 0
}
],
"log": []
]
}
39 changes: 14 additions & 25 deletions examples/chef/devices/rootnode_pump_5f904818cc.zap
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-rootdevice",
"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 @@ -6244,24 +6239,19 @@
"id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 14,
"code": 771,
"profileId": 2457,
"label": "MA-pump",
"name": "MA-pump"
},
"deviceTypes": [
{
"id": 14,
"code": 771,
"profileId": 2457,
"label": "MA-pump",
"name": "MA-pump"
}
],
"deviceTypeRefs": [
14
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -7689,7 +7679,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -7705,7 +7695,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -7721,7 +7711,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -7737,7 +7727,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -7981,7 +7971,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -7997,7 +7987,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -8013,7 +8003,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -8029,7 +8019,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -8193,7 +8183,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -8209,7 +8199,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -8225,7 +8215,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -8241,7 +8231,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -8302,6 +8292,5 @@
"endpointId": 1,
"networkId": 0
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -12727,6 +12727,5 @@
"endpointId": 3,
"networkId": 0
}
],
"log": []
]
}
33 changes: 6 additions & 27 deletions examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
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,27 +33,22 @@
],
"endpointTypes": [
{
"id": 8,
"id": 1,
"name": "MA-rootdevice",
"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 @@ -6252,27 +6247,22 @@
]
},
{
"id": 7,
"id": 2,
"name": "MA-refrigerator",
"deviceTypeRef": {
"id": 48,
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
"name": "MA-refrigerator"
},
"deviceTypes": [
{
"id": 48,
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
"name": "MA-refrigerator"
}
],
"deviceTypeRefs": [
48
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -11686,27 +11676,22 @@
]
},
{
"id": 5,
"id": 3,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 51,
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
},
"deviceTypes": [
{
"id": 51,
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
}
],
"deviceTypeRefs": [
51
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -12202,27 +12187,22 @@
]
},
{
"id": 6,
"id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 51,
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
},
"deviceTypes": [
{
"id": 51,
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
}
],
"deviceTypeRefs": [
51
],
"deviceVersions": [
1
],
Expand Down Expand Up @@ -12747,6 +12727,5 @@
"endpointId": 3,
"networkId": 0
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -6993,6 +6993,5 @@
"endpointId": 1,
"networkId": 0
}
],
"log": []
]
}
4 changes: 2 additions & 2 deletions scripts/setup/zap.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"mac-amd64",
"windows-amd64"
],
"tags": ["version:[email protected].01-nightly.1"]
"tags": ["version:[email protected].05-nightly.1"]
},
{
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
"path": "fuchsia/third_party/zap/mac-amd64",
"platforms": ["mac-arm64"],
"tags": ["version:[email protected].01-nightly.1"]
"tags": ["version:[email protected].05-nightly.1"]
}
]
}
2 changes: 1 addition & 1 deletion scripts/setup/zap.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2023.09.01-nightly
v2023.09.05-nightly
2 changes: 1 addition & 1 deletion scripts/tools/zap/zap_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
# files may need updating for versions
#
MIN_ZAP_VERSION = '2023.9.1'
MIN_ZAP_VERSION = '2023.9.5'


class ZapTool:
Expand Down

0 comments on commit 3742211

Please sign in to comment.