From dcd49fba44363112e9a188fba0f043a0d0570b69 Mon Sep 17 00:00:00 2001 From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:49:35 -0500 Subject: [PATCH] Update ZAP version to v2023.11.08-nightly (#30445) * Regen with new zap version. Activate code to parse discovery response with added variables * Update ZAP version to v2023.11.08-nightly * Convert and regen all --- .../air-quality-sensor-app.zap | 8 ++++---- .../all-clusters-common/all-clusters-app.zap | 12 ++++++------ .../all-clusters-minimal-app.zap | 8 ++++---- .../bridge-app/bridge-common/bridge-app.zap | 8 ++++---- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 8 ++++---- .../contact-sensor-app.zap | 8 ++++---- .../light-switch-common/light-switch-app.zap | 8 ++++---- .../data_model/lighting-app-thread.zap | 8 ++++---- .../lighting-common/lighting-app.zap | 8 ++++---- .../lighting-app/nxp/zap/lighting-on-off.zap | 8 ++++---- examples/lighting-app/qpg/zap/light.zap | 8 ++++---- .../silabs/data_model/lighting-thread-app.zap | 8 ++++---- examples/lock-app/lock-common/lock-app.zap | 8 ++++---- examples/lock-app/nxp/zap/lock-app.zap | 8 ++++---- examples/lock-app/qpg/zap/lock.zap | 8 ++++---- .../placeholder/linux/apps/app1/config.zap | 8 ++++---- .../placeholder/linux/apps/app2/config.zap | 8 ++++---- examples/pump-app/pump-common/pump-app.zap | 8 ++++---- .../silabs/data_model/pump-thread-app.zap | 8 ++++---- .../silabs/data_model/pump-wifi-app.zap | 8 ++++---- .../pump-controller-app.zap | 8 ++++---- .../resource-monitoring-app.zap | 8 ++++---- .../smoke-co-alarm-app.zap | 8 ++++---- .../nxp/zap/thermostat_matter_thread.zap | 8 ++++---- .../thermostat-common/thermostat.zap | 8 ++++---- examples/tv-app/tv-common/tv-app.zap | 8 ++++---- .../virtual-device-app.zap | 8 ++++---- examples/window-app/common/window-app.zap | 8 ++++---- scripts/setup/zap.json | 4 ++-- scripts/setup/zap.version | 2 +- .../zap/tests/inputs/all-clusters-app.zap | 8 ++++---- .../tools/zap/tests/inputs/lighting-app.zap | 8 ++++---- scripts/tools/zap/zap_execution.py | 2 +- .../commands/discovery/DiscoveryCommands.cpp | 19 +++++++++---------- .../tests/simulated-cluster-objects.h | 10 ++++++++++ 35 files changed, 145 insertions(+), 136 deletions(-) diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap index 55241805cf8a25..440a130222bc83 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap @@ -1832,7 +1832,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1848,7 +1848,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1864,7 +1864,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2660,7 +2660,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index f7aef9ddfb911d..ca0a7b9b9564c1 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -17,12 +17,6 @@ } ], "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-with-test-extensions.json", @@ -30,6 +24,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 805db2c873a8a4..90bc68f64d89bf 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -2748,7 +2748,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2764,7 +2764,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2780,7 +2780,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2856,7 +2856,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 1694ce8c9c2905..5013e53e85fda4 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -2339,7 +2339,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2355,7 +2355,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2371,7 +2371,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3167,7 +3167,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 4bfed04b0f5876..fe404e38cc0c9f 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1804,7 +1804,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1820,7 +1820,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1836,7 +1836,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2632,7 +2632,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 2b9c402cfd5cc7..bab9345f11f795 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -2188,7 +2188,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2204,7 +2204,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2220,7 +2220,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3016,7 +3016,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 9ed17e0fcb86fa..5b0585a6aa1c39 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -2106,7 +2106,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2122,7 +2122,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2138,7 +2138,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2934,7 +2934,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index 8936dd0edcd723..91b1cb089467ab 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -2059,7 +2059,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2075,7 +2075,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2091,7 +2091,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2887,7 +2887,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index e734a6642d7968..99a9c4e2bfd0d5 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -2069,7 +2069,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2085,7 +2085,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2101,7 +2101,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2897,7 +2897,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 2cf20e026e3810..ee9acb6f339fed 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -1616,7 +1616,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1632,7 +1632,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1648,7 +1648,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2396,7 +2396,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index a4bf910115e3ac..ac6d3361a666ac 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -2321,7 +2321,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2337,7 +2337,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2353,7 +2353,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3101,7 +3101,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 0aa88bd9fcf18b..7df31fb12e6a0d 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -2011,7 +2011,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2027,7 +2027,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2043,7 +2043,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2839,7 +2839,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 6999fab07ccce3..ea9e37dd690d77 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -2874,7 +2874,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2890,7 +2890,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2906,7 +2906,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3702,7 +3702,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index c9f481d42a8da8..2632e6556aca0c 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -1409,7 +1409,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1425,7 +1425,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1441,7 +1441,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2189,7 +2189,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index 2666f5963c0b11..40dd10c27df989 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -2321,7 +2321,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2337,7 +2337,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2353,7 +2353,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3101,7 +3101,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index d6e57d3c47ca99..6bdeec2a4c68fc 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -3194,7 +3194,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3210,7 +3210,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3226,7 +3226,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4022,7 +4022,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index ecac9168e4abb7..c61289814dd85e 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -3210,7 +3210,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3226,7 +3226,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3242,7 +3242,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4038,7 +4038,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 230e0faeb77821..8123cfeed78cf1 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1916,7 +1916,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1932,7 +1932,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1948,7 +1948,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2024,7 +2024,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index c372522b7ac2fe..1e3b8c42177397 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -1916,7 +1916,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1932,7 +1932,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1948,7 +1948,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2024,7 +2024,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index c372522b7ac2fe..1e3b8c42177397 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -1916,7 +1916,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1932,7 +1932,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1948,7 +1948,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2024,7 +2024,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 912a59ade3b9c4..3e2892f5f6980a 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1916,7 +1916,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1932,7 +1932,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1948,7 +1948,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2024,7 +2024,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index c10f47aca144b8..4d7e0be291c3ec 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -2209,7 +2209,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2225,7 +2225,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2241,7 +2241,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3037,7 +3037,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index 69861bd293b214..4c14f07879f16f 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -1977,7 +1977,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1993,7 +1993,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2009,7 +2009,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2805,7 +2805,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap index cc72ecf8307cf6..56dd1a3407ac3f 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap @@ -2015,7 +2015,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2031,7 +2031,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2047,7 +2047,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2843,7 +2843,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index a741df6849f750..0814a6f2d070de 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -2222,7 +2222,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2238,7 +2238,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2254,7 +2254,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3050,7 +3050,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 25ccf3b44bea3a..551d980c0d75e6 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -2248,7 +2248,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2264,7 +2264,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2280,7 +2280,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3076,7 +3076,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap index 79e2c409ceb1eb..097ec6eccb6b40 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap @@ -2046,7 +2046,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2062,7 +2062,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2078,7 +2078,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2874,7 +2874,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 28314ee68094b6..5f68fc675bd72d 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -2872,7 +2872,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2888,7 +2888,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2904,7 +2904,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3700,7 +3700,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index 94d4799af8f241..691131f97e2109 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,13 +8,13 @@ "mac-amd64", "windows-amd64" ], - "tags": ["version:2@v2023.10.30-nightly.1"] + "tags": ["version:2@v2023.11.08-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:2@v2023.10.30-nightly.1"] + "tags": ["version:2@v2023.11.08-nightly.1"] } ] } diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version index 7cea852e9c90f1..7bcbd806cdbdbd 100644 --- a/scripts/setup/zap.version +++ b/scripts/setup/zap.version @@ -1 +1 @@ -v2023.10.30-nightly +v2023.11.08-nightly diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index a3ee12cfc09b3c..d27cf85bd498b7 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -3204,7 +3204,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3220,7 +3220,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3236,7 +3236,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4032,7 +4032,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 6a9a50711c99c2..b2552f4c791468 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -2209,7 +2209,7 @@ "code": 10, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2225,7 +2225,7 @@ "code": 11, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2241,7 +2241,7 @@ "code": 12, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3037,7 +3037,7 @@ "reportableChange": 0 }, { - "name": "ActiveNetworkFaults", + "name": "ActiveNetworkFaultsList", "code": 62, "mfgCode": null, "side": "server", diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 4aa1eac29d4bed..9d8a1bf3c0b495 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -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.10.28' +MIN_ZAP_VERSION = '2023.11.8' class ZapTool: diff --git a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp index 1b15ff761f9a4e..5c7f3fc9f318d3 100644 --- a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp +++ b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp @@ -175,16 +175,15 @@ void DiscoveryCommands::OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & data.mrpRetryIntervalActive.SetValue(nodeData.resolutionData.mrpRetryIntervalActive.Value().count()); } - // TODO need to add new entries for kDefaultResponse in DiscoveryCommands.js (project-chip/zap) before adding this - // if (nodeData.resolutionData.mrpRetryActiveThreshold.HasValue()) - // { - // data.mrpRetryActiveThreshold.SetValue(nodeData.resolutionData.mrpRetryActiveThreshold.Value().count()); - // } - - // if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue()) - // { - // data.isICDOperatingAsLIT.SetValue(resolutionData.isICDOperatingAsLIT.Value()); - // } + if (nodeData.resolutionData.mrpRetryActiveThreshold.HasValue()) + { + data.mrpRetryActiveThreshold.SetValue(nodeData.resolutionData.mrpRetryActiveThreshold.Value().count()); + } + + if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue()) + { + data.isICDOperatingAsLIT.SetValue(nodeData.resolutionData.isICDOperatingAsLIT.Value()); + } chip::app::StatusIB status; status.mStatus = chip::Protocols::InteractionModel::Status::Success; diff --git a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h index dcb93f3806b370..e75d11598b9b0b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h @@ -759,6 +759,8 @@ struct DiscoveryCommandResponse uint16_t port; Optional mrpRetryIntervalIdle; Optional mrpRetryIntervalActive; + Optional mrpRetryActiveThreshold; + Optional isICDOperatingAsLIT; CHIP_ERROR Encode(chip::TLV::TLVWriter & writer, chip::TLV::Tag tag) const { @@ -782,6 +784,8 @@ struct DiscoveryCommandResponse ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(15), port)); ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(16), mrpRetryIntervalIdle)); ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(17), mrpRetryIntervalActive)); + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(18), mrpRetryActiveThreshold)); + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(19), isICDOperatingAsLIT)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -852,6 +856,12 @@ struct DiscoveryCommandResponse case 17: ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, mrpRetryIntervalActive)); break; + case 18: + ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, mrpRetryActiveThreshold)); + break; + case 19: + ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, isICDOperatingAsLIT)); + break; default: break; }