From 63959b5ec703a1b1ae3274ac8fabbac3630c4549 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 27 Aug 2024 16:46:36 -0400 Subject: [PATCH] Re-run zap_convert_all on the tree. There have been various XML modifications that have not made it into the relevant .zap files. --- .../air-purifier-common/air-purifier-app.zap | 2 +- .../all-clusters-common/all-clusters-app.zap | 14 +- .../all-clusters-minimal-app.zap | 22 +-- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 4 +- ...r_humiditysensor_thermostat_56de3d5f45.zap | 6 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 22 +-- .../rootnode_contactsensor_27f76aeaf5.zap | 4 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 4 +- ...rootnode_dimmablepluginunit_f8a9a0b9d4.zap | 4 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 8 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 14 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 4 +- ...rootnode_roomairconditioner_9cf3607804.zap | 19 ++- .../rootnode_thermostat_bm3fb8dhYi.zap | 24 +-- .../contact-sensor-app.zap | 4 +- .../light-switch-common/light-switch-app.zap | 14 +- examples/light-switch-app/qpg/zap/switch.zap | 10 +- .../data_model/lighting-app-ethernet.zap | 8 +- .../data_model/lighting-app-thread.zap | 8 +- .../data_model/lighting-app-wifi.zap | 8 +- .../lighting-common/lighting-app.zap | 26 ++-- examples/lighting-app/qpg/zap/light.zap | 15 +- .../silabs/data_model/lighting-thread-app.zap | 8 +- .../silabs/data_model/lighting-wifi-app.zap | 8 +- .../lit-icd-common/lit-icd-server-app.zap | 2 +- examples/lock-app/lock-common/lock-app.zap | 18 +-- .../microwave-oven-app.zap | 14 +- .../ota-provider-common/ota-provider-app.zap | 14 +- .../ota-requestor-app.zap | 140 +++++++++--------- .../placeholder/linux/apps/app1/config.zap | 34 ++--- .../placeholder/linux/apps/app2/config.zap | 34 ++--- examples/pump-app/pump-common/pump-app.zap | 4 +- .../silabs/data_model/pump-thread-app.zap | 4 +- .../silabs/data_model/pump-wifi-app.zap | 4 +- .../nxp/zap/thermostat_matter_thread.zap | 14 +- .../nxp/zap/thermostat_matter_wifi.zap | 14 +- .../qpg/zap/thermostaticRadiatorValve.zap | 12 +- .../thread-br-common/thread-br-app.zap | 2 +- .../tv-casting-common/tv-casting-app.zap | 14 +- .../virtual-device-app.zap | 8 +- examples/window-app/common/window-app.zap | 14 +- .../zap/tests/inputs/all-clusters-app.zap | 18 +-- .../tools/zap/tests/inputs/lighting-app.zap | 12 +- .../data_model/controller-clusters.zap | 15 +- 44 files changed, 326 insertions(+), 325 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap index 9d65016495b691..0ffbbd01e7c139 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap @@ -7970,7 +7970,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, 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 9a736eea56fa30..af5bb9c4e8ccde 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 @@ -13445,7 +13445,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "WaterHeaterTypeBitmap", + "type": "WaterHeaterHeatSourceBitmap", "included": 1, "storageOption": "External", "singleton": 0, @@ -13461,7 +13461,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "WaterHeaterDemandBitmap", + "type": "WaterHeaterHeatSourceBitmap", "included": 1, "storageOption": "External", "singleton": 0, @@ -17507,7 +17507,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DriftCompensationEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17555,7 +17555,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17571,7 +17571,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -18083,7 +18083,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -18179,7 +18179,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, 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 dbab34c300bd41..528dd80c73bfd2 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 @@ -6932,7 +6932,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7202,7 +7202,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7218,7 +7218,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7250,7 +7250,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7266,7 +7266,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7995,10 +7995,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -9965,7 +9965,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10541,7 +10541,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11917,10 +11917,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 444408ac97d1ac..ec8d9f537cc5ed 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4783,10 +4783,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap index 0b88b6a936cad5..0cfb36a59885d7 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap @@ -7991,7 +7991,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8007,7 +8007,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8023,7 +8023,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index d9ba9c9926b329..a9c844becdbc4c 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -19,18 +19,18 @@ "package": [ { "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/zcl/zcl.json", - "type": "zcl-properties", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", "category": "matter", - "version": 1, - "description": "Matter SDK ZCL data" + "version": "chip-v1" }, { "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", + "path": "../../../src/app/zap-templates/zcl/zcl.json", + "type": "zcl-properties", "category": "matter", - "version": "chip-v1" + "version": 1, + "description": "Matter SDK ZCL data" } ], "endpointTypes": [ @@ -3408,7 +3408,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3424,7 +3424,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3760,7 +3760,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3776,7 +3776,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap index 02a553e03f9cd1..2c65da229ebbe4 100644 --- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap +++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap @@ -4128,7 +4128,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -4704,7 +4704,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 3feb19881c6a29..9b755037ba1aa6 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3520,10 +3520,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap index 275f5f81144816..94d7fb252c2d68 100644 --- a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap +++ b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap @@ -3813,10 +3813,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index f0fc3c6c264c20..638adf2680e590 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -3720,7 +3720,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3736,7 +3736,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3784,7 +3784,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3880,7 +3880,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 88f0e7a0408646..b3f7ab84762651 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 3d817ad7191ee9..3f61a61d3c5b58 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -2974,10 +2974,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap index f831de4d5d9a7c..80384bf72b175b 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap @@ -24,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ @@ -2706,7 +2713,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2722,7 +2729,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2738,7 +2745,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2754,7 +2761,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2770,7 +2777,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2786,7 +2793,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index aa5d18f081aa94..c30fe33f9e465c 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -3064,7 +3064,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3176,7 +3176,7 @@ "code": 9, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "HVACSystemTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3208,7 +3208,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3224,7 +3224,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3240,7 +3240,7 @@ "code": 19, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3256,7 +3256,7 @@ "code": 20, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3272,7 +3272,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3288,7 +3288,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3304,7 +3304,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3320,7 +3320,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3804,10 +3804,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 0486ab6d328c97..90b0a3cb5de3fe 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 @@ -4702,10 +4702,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 fdeaef99bfcc36..806d45be48fb3c 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 @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ diff --git a/examples/light-switch-app/qpg/zap/switch.zap b/examples/light-switch-app/qpg/zap/switch.zap index b402b32c960efa..2b36781c42eb18 100644 --- a/examples/light-switch-app/qpg/zap/switch.zap +++ b/examples/light-switch-app/qpg/zap/switch.zap @@ -1379,7 +1379,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1395,7 +1395,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1411,7 +1411,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1427,7 +1427,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1443,7 +1443,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index 87d6c2f4c2f2a8..3d2d2dcd4e8fcb 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -3751,7 +3751,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3767,7 +3767,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4103,7 +4103,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4199,7 +4199,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, 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 95e21f91d9870a..b084fcfd7d1c37 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -4727,7 +4727,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4743,7 +4743,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5079,7 +5079,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5175,7 +5175,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index 35a6c1aa4c9d4a..f5cb52e7b86d57 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -3934,7 +3934,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3950,7 +3950,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4286,7 +4286,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4382,7 +4382,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index e73563ebe35ec8..5e4382d50c1617 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ @@ -5552,7 +5552,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5568,7 +5568,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5616,7 +5616,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5712,7 +5712,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5884,10 +5884,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index 6390c7f37267d8..a0f3e99fd53484 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../../src/app/zap-templates/zcl/zcl.json", @@ -5412,7 +5405,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5428,7 +5421,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5764,7 +5757,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5860,7 +5853,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, 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 a3fd5e516aad09..bac845f9ab0c73 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -4991,7 +4991,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5007,7 +5007,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5055,7 +5055,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5151,7 +5151,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index 6d438d10e14001..eec18d5e0615b2 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -4766,7 +4766,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -4782,7 +4782,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4830,7 +4830,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -4926,7 +4926,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap index bc32dbce677fb2..c7354adc058a6f 100644 --- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap +++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap @@ -3562,7 +3562,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 30fe0db47c2fa8..4403019057a295 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -6296,7 +6296,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6312,7 +6312,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6328,7 +6328,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6344,7 +6344,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6360,7 +6360,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6376,7 +6376,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6392,7 +6392,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6408,7 +6408,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -6424,7 +6424,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap index 1df2afdd38fc8a..03113285ad2567 100644 --- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap +++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index b019c91de5ef04..c98b9e661328e5 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index ce4e60fe260d25..2ae993e399dd18 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ @@ -104,7 +104,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 @@ -120,7 +120,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 @@ -136,7 +136,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 @@ -151,7 +151,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -167,7 +167,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -183,7 +183,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -199,7 +199,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -258,7 +258,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -274,7 +274,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -337,7 +337,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -353,7 +353,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -369,7 +369,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -460,7 +460,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -476,7 +476,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -492,7 +492,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -508,7 +508,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -524,7 +524,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -540,7 +540,7 @@ "singleton": 1, "bounded": 0, "defaultValue": "", - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -556,7 +556,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -572,7 +572,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -588,7 +588,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -604,7 +604,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -620,7 +620,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 @@ -795,7 +795,7 @@ "storageOption": "External", "singleton": 1, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -811,7 +811,7 @@ "storageOption": "External", "singleton": 1, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -827,7 +827,7 @@ "storageOption": "External", "singleton": 1, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -843,7 +843,7 @@ "storageOption": "External", "singleton": 1, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1082,7 +1082,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1098,7 +1098,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1114,7 +1114,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1130,7 +1130,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1212,7 +1212,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "en-US", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1228,7 +1228,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1243,7 +1243,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1259,7 +1259,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1275,7 +1275,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1291,7 +1291,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1350,7 +1350,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "0", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1569,7 +1569,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1585,7 +1585,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1601,7 +1601,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1617,7 +1617,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1877,7 +1877,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1893,7 +1893,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1909,7 +1909,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1925,7 +1925,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2042,7 +2042,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -2153,7 +2153,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2169,7 +2169,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2185,7 +2185,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2201,7 +2201,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2342,7 +2342,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2358,7 +2358,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2374,7 +2374,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2390,7 +2390,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2642,7 +2642,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2658,7 +2658,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2674,7 +2674,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2690,7 +2690,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2862,7 +2862,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2878,7 +2878,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2894,7 +2894,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2910,7 +2910,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 0dff614f290388..0e42cc059957b8 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -7941,7 +7941,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "External", "singleton": 0, @@ -8053,7 +8053,7 @@ "code": 9, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "HVACSystemTypeBitmap", "included": 1, "storageOption": "External", "singleton": 0, @@ -8085,7 +8085,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8101,7 +8101,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8117,7 +8117,7 @@ "code": 19, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -8133,7 +8133,7 @@ "code": 20, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -8149,7 +8149,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8165,7 +8165,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8181,7 +8181,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8197,7 +8197,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14093,7 +14093,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DriftCompensationEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14141,7 +14141,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -14157,7 +14157,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14669,7 +14669,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14765,7 +14765,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15081,10 +15081,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index a3b75ae5203e2f..f67eef332ecec4 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -8015,7 +8015,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "External", "singleton": 0, @@ -8127,7 +8127,7 @@ "code": 9, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "HVACSystemTypeBitmap", "included": 1, "storageOption": "External", "singleton": 0, @@ -8159,7 +8159,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8175,7 +8175,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8191,7 +8191,7 @@ "code": 19, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -8207,7 +8207,7 @@ "code": 20, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "External", "singleton": 0, @@ -8223,7 +8223,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8239,7 +8239,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8255,7 +8255,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8271,7 +8271,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13853,7 +13853,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DriftCompensationEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13901,7 +13901,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -13917,7 +13917,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14429,7 +14429,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14525,7 +14525,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14841,10 +14841,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 17e0732704d2af..0d3235ce637719 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -4626,10 +4626,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 d977c40da06770..b58b4f50c804f5 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -4626,10 +4626,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 d977c40da06770..b58b4f50c804f5 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -4626,10 +4626,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap index 8824bce22564b9..0ed071f900d8b4 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap @@ -5151,7 +5151,7 @@ "code": 9, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "HVACSystemTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5167,7 +5167,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5183,7 +5183,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5199,7 +5199,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5215,7 +5215,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5231,7 +5231,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5247,7 +5247,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap index fbb71356ddaf07..000bc243947016 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap @@ -4245,7 +4245,7 @@ "code": 9, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "HVACSystemTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4261,7 +4261,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -4277,7 +4277,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -4293,7 +4293,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4309,7 +4309,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4325,7 +4325,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4341,7 +4341,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap index c30867b7da3149..6077dfb9d0f599 100644 --- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap +++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap @@ -4098,7 +4098,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -4114,7 +4114,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -4130,7 +4130,7 @@ "code": 21, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4146,7 +4146,7 @@ "code": 22, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4162,7 +4162,7 @@ "code": 23, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4178,7 +4178,7 @@ "code": 24, "mfgCode": null, "side": "server", - "type": "int16s", + "type": "temperature", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/thread-br-app/thread-br-common/thread-br-app.zap b/examples/thread-br-app/thread-br-common/thread-br-app.zap index e8c999068390e6..cad9d37b2d6286 100644 --- a/examples/thread-br-app/thread-br-common/thread-br-app.zap +++ b/examples/thread-br-app/thread-br-common/thread-br-app.zap @@ -2913,7 +2913,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 4f234c23f8eadb..a8cb35694cf8f7 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ 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 5fdeb3f38b60a8..16a11f8316f4e7 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 @@ -6416,7 +6416,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6432,7 +6432,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6464,7 +6464,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6480,7 +6480,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index ae2f7195f18070..7610434e4517e6 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -17,13 +17,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "category": "matter", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -31,6 +24,13 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "category": "matter", + "version": "chip-v1" } ], "endpointTypes": [ diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 1cbd309ffa123a..b8f64608364df4 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -17018,7 +17018,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "DriftCompensationEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17066,7 +17066,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17082,7 +17082,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17594,7 +17594,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -17690,7 +17690,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -18707,10 +18707,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -24720,10 +24720,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 9935fea81069d3..b0bb70a68fbe5d 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -5552,7 +5552,7 @@ "code": 8, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "ColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5568,7 +5568,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5616,7 +5616,7 @@ "code": 16385, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "EnhancedColorModeEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5712,7 +5712,7 @@ "code": 16394, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "ColorCapabilitiesBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5884,10 +5884,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index c82cc3da84f30c..0c4c6a7a1a842e 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -3226,7 +3226,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -3239,10 +3239,10 @@ "side": "client", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -3491,7 +3491,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -4910,10 +4910,10 @@ "side": "client", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -4944,6 +4944,7 @@ "define": "THREAD_NETWORK_DIRECTORY_CLUSTER", "side": "client", "enabled": 1, + "apiMaturity": "provisional", "commands": [ { "name": "AddNetwork", @@ -5994,4 +5995,4 @@ "parentEndpointIdentifier": null } ] -} +} \ No newline at end of file