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
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 5524180..440a130 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 f7aef9d..ca0a7b9 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
@@ -19,17 +19,17 @@
"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",
"type": "zcl-properties",
"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 805db2c..90bc68f 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 1694ce8..5013e53 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 4bfed04..fe404e3 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 2b9c402..bab9345 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 9ed17e0..5b0585a 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 8936dd0..91b1cb0 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 e734a66..99a9c4e 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 2cf20e0..ee9acb6 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 a4bf910..ac6d336 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 0aa88bd..7df31fb 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 6999fab..ea9e37d 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 c9f481d..2632e65 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 2666f59..40dd10c 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 d6e57d3..6bdeec2 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 ecac916..c612898 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 230e0fa..8123cfe 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 c372522..1e3b8c4 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 c372522..1e3b8c4 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 912a59a..3e2892f 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 c10f47a..4d7e0be 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 69861bd..4c14f07 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 cc72ecf..56dd1a3 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 a741df6..0814a6f 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 25ccf3b..551d980 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 79e2c40..097ec6e 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 28314ee..5f68fc6 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 94d4799..691131f 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 7cea852..7bcbd80 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 a3ee12c..d27cf85 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 6a9a507..b2552f4 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 4aa1eac..9d8a1bf 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 1b15ff7..5c7f3fc 100644
--- a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
+++ b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
@@ -175,16 +175,15 @@
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.mrpRetryActiveThreshold.HasValue())
+ {
+ data.mrpRetryActiveThreshold.SetValue(nodeData.resolutionData.mrpRetryActiveThreshold.Value().count());
+ }
- // if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue())
- // {
- // data.isICDOperatingAsLIT.SetValue(resolutionData.isICDOperatingAsLIT.Value());
- // }
+ 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 dcb93f3..e75d115 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 @@
uint16_t port;
Optional<uint32_t> mrpRetryIntervalIdle;
Optional<uint32_t> mrpRetryIntervalActive;
+ Optional<uint16_t> mrpRetryActiveThreshold;
+ Optional<bool> isICDOperatingAsLIT;
CHIP_ERROR Encode(chip::TLV::TLVWriter & writer, chip::TLV::Tag tag) const
{
@@ -782,6 +784,8 @@
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 @@
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;
}
