Generated using ./scripts/tools/zap_convert_all.py (#37343)
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 a869118..983d604 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2109,14 +2111,16 @@
"code": 45,
"profileId": 259,
"label": "MA-air-purifier",
- "name": "MA-air-purifier"
+ "name": "MA-air-purifier",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 45,
"profileId": 259,
"label": "MA-air-purifier",
- "name": "MA-air-purifier"
+ "name": "MA-air-purifier",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2220,22 +2224,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2390,22 +2378,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2602,22 +2574,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2814,22 +2770,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3122,22 +3062,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3196,14 +3120,16 @@
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3299,22 +3225,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3469,22 +3379,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3591,22 +3485,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3873,22 +3751,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4155,22 +4017,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4437,22 +4283,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4719,22 +4549,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5001,22 +4815,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5283,22 +5081,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5565,22 +5347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5847,22 +5613,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6129,22 +5879,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6411,22 +6145,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6485,14 +6203,16 @@
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -6596,22 +6316,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6766,22 +6470,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6936,22 +6624,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7010,14 +6682,16 @@
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -7121,22 +6795,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7291,22 +6949,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7461,22 +7103,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7535,14 +7161,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -7646,22 +7274,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7816,22 +7428,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -8044,22 +7640,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 03d4b9e..d99c245 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3720,14 +3722,16 @@
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3823,22 +3827,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3993,22 +3981,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4115,22 +4087,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4269,22 +4225,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4423,22 +4363,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4577,22 +4501,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4731,22 +4639,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4885,22 +4777,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5039,22 +4915,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5193,22 +5053,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5347,22 +5191,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5501,22 +5329,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5655,22 +5467,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5809,22 +5605,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5963,22 +5743,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 c358628..4949c94 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -18047,10 +18047,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "10",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -23924,10 +23924,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "10",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
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 82b1b24..8adf8fb 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -314,22 +317,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -558,22 +545,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -913,22 +884,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1241,22 +1196,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1363,22 +1302,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1469,22 +1392,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1639,22 +1546,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1875,22 +1766,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2231,22 +2106,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2495,22 +2354,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3341,22 +3184,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3641,22 +3468,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3861,22 +3672,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4141,20 +3936,23 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -4260,22 +4058,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4464,22 +4246,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4700,22 +4466,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5058,22 +4808,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5360,22 +5094,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6165,22 +5883,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -10527,20 +10229,23 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -10646,22 +10351,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -10850,22 +10539,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11086,22 +10759,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11256,22 +10913,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11426,22 +11067,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11687,22 +11312,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11851,14 +11460,16 @@
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -11976,22 +11587,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -12284,22 +11879,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 3dc8eff..5ba31d4 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index c72734d..0b3dc7d 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3586,14 +3588,16 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
index 2530faa..b867c14 100644
--- a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
+++ b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2283,14 +2285,16 @@
"code": 45,
"profileId": 259,
"label": "MA-air-purifier",
- "name": "MA-air-purifier"
+ "name": "MA-air-purifier",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 45,
"profileId": 259,
"label": "MA-air-purifier",
- "name": "MA-air-purifier"
+ "name": "MA-air-purifier",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2386,22 +2390,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2534,22 +2522,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2704,22 +2676,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2916,22 +2872,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3128,22 +3068,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3436,22 +3360,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 53956db..9885c2e 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1928,14 +1930,16 @@
"code": 45,
"profileId": 259,
"label": "MA-air-purifier",
- "name": "MA-air-purifier"
+ "name": "MA-air-purifier",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 45,
"profileId": 259,
"label": "MA-air-purifier",
- "name": "MA-air-purifier"
+ "name": "MA-air-purifier",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2039,22 +2043,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2243,22 +2231,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2413,22 +2385,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2625,22 +2581,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2837,22 +2777,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3145,22 +3069,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3219,14 +3127,16 @@
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3322,22 +3232,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3492,22 +3386,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3614,22 +3492,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3896,22 +3758,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4178,22 +4024,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4460,22 +4290,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4742,22 +4556,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5024,22 +4822,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5306,22 +5088,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5588,22 +5354,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5870,22 +5620,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6152,22 +5886,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6434,22 +6152,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6508,14 +6210,16 @@
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -6619,22 +6323,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6789,22 +6477,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6959,22 +6631,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7033,14 +6689,16 @@
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -7144,22 +6802,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7314,22 +6956,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7484,22 +7110,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7558,14 +7168,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -7669,22 +7281,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7839,22 +7435,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -8099,22 +7679,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
index bd93cb0..4d59f2c 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2283,14 +2285,16 @@
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 44,
"profileId": 259,
"label": "MA-air-quality-sensor",
- "name": "MA-air-quality-sensor"
+ "name": "MA-air-quality-sensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2386,22 +2390,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2556,22 +2544,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2886,22 +2858,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3024,22 +2980,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3194,22 +3134,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3364,22 +3288,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3646,22 +3554,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3928,22 +3820,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4210,22 +4086,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4492,22 +4352,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4774,22 +4618,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5056,22 +4884,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5338,22 +5150,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5620,22 +5416,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5902,22 +5682,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6184,22 +5948,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index 0bb3ed6..f3a620a 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 40,
"profileId": 259,
"label": "MA-basic-videoplayer",
- "name": "MA-basic-videoplayer"
+ "name": "MA-basic-videoplayer",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 40,
"profileId": 259,
"label": "MA-basic-videoplayer",
- "name": "MA-basic-videoplayer"
+ "name": "MA-basic-videoplayer",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2394,22 +2398,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2564,22 +2552,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2686,22 +2658,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2874,22 +2830,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3030,22 +2970,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3355,22 +3279,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3536,22 +3444,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3652,22 +3544,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3776,22 +3652,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3932,22 +3792,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4006,14 +3850,16 @@
"code": 34,
"profileId": 259,
"label": "MA-speaker",
- "name": "MA-speaker"
+ "name": "MA-speaker",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 34,
"profileId": 259,
"label": "MA-speaker",
- "name": "MA-speaker"
+ "name": "MA-speaker",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4117,22 +3963,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4265,22 +4095,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4517,22 +4331,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4687,22 +4485,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index fc2f45d..e47824f 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2233,14 +2235,16 @@
"code": 268,
"profileId": 259,
"label": "MA-colortemperaturelight",
- "name": "MA-colortemperaturelight"
+ "name": "MA-colortemperaturelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 268,
"profileId": 259,
"label": "MA-colortemperaturelight",
- "name": "MA-colortemperaturelight"
+ "name": "MA-colortemperaturelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
index 0e390cd..88d6f1d 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,20 +2293,23 @@
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2410,22 +2415,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2894,22 +2883,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index bab2b45..ef452c9 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,20 +2293,23 @@
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -3090,22 +3095,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3212,22 +3201,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap b/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap
index 05d1c22..6e6b2f9 100644
--- a/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 2e215aa..4ac9eb7 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2323,14 +2325,16 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap
index 3ba9164..01f5ba4 100644
--- a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap
+++ b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 267,
"profileId": 259,
"label": "MA-dimmablepluginunit",
- "name": "MA-dimmablepluginunit"
+ "name": "MA-dimmablepluginunit",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 267,
"profileId": 259,
"label": "MA-dimmablepluginunit",
- "name": "MA-dimmablepluginunit"
+ "name": "MA-dimmablepluginunit",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2402,22 +2406,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2606,22 +2594,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2842,22 +2814,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3126,22 +3082,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3296,22 +3236,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3549,22 +3473,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
index 3ad6e7d..db9648b 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -900,7 +902,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -916,7 +918,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -932,23 +934,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -964,7 +950,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2808,14 +2794,16 @@
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3051,22 +3039,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3259,10 +3231,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3385,22 +3357,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3541,22 +3497,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3729,22 +3669,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index 1c9d250..3fdf688 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,20 +2293,23 @@
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2410,22 +2415,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2580,22 +2569,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2894,22 +2867,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3650,22 +3607,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index c5008df..f1bfab3 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 39239ea..790dd1d 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index b1a23b0..35a9468 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 774,
"profileId": 259,
"label": "MA-flowsensor",
- "name": "MA-flowsensor"
+ "name": "MA-flowsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 774,
"profileId": 259,
"label": "MA-flowsensor",
- "name": "MA-flowsensor"
+ "name": "MA-flowsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap
index 6860a53..7b88c8d 100644
--- a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap
+++ b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1928,20 +1930,23 @@
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2047,22 +2052,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2233,22 +2222,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2547,22 +2520,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2685,22 +2642,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
index 79ec355..86fdf7c 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1928,20 +1930,23 @@
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2047,22 +2052,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2233,22 +2222,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2547,22 +2520,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2685,22 +2642,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 9c52de3..761124d 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 768,
"profileId": 259,
"label": "MA-heatcool",
- "name": "MA-heatcool"
+ "name": "MA-heatcool",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 768,
"profileId": 259,
"label": "MA-heatcool",
- "name": "MA-heatcool"
+ "name": "MA-heatcool",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap
index e05f413..9310859 100644
--- a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap
+++ b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -2449,7 +2449,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4382,6 +4382,4 @@
"parentEndpointIdentifier": null
}
]
-}
-
-
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index f62c601..fbb8782 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap b/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
index a00af79..9476e57 100644
--- a/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
+++ b/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -939,22 +941,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2808,14 +2794,16 @@
"code": 124,
"profileId": 259,
"label": "MA-laundry-dryer",
- "name": "MA-laundry-dryer"
+ "name": "MA-laundry-dryer",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 124,
"profileId": 259,
"label": "MA-laundry-dryer",
- "name": "MA-laundry-dryer"
+ "name": "MA-laundry-dryer",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3051,22 +3039,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3221,22 +3193,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3330,7 +3286,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3369,22 +3325,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3613,22 +3553,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
index 4de60f9..d2ff10e 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index 833cca1..730d061 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 262,
"profileId": 259,
"label": "MA-lightsensor",
- "name": "MA-lightsensor"
+ "name": "MA-lightsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 262,
"profileId": 259,
"label": "MA-lightsensor",
- "name": "MA-lightsensor"
+ "name": "MA-lightsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index 05d6200..c0cdfbf 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 263,
"profileId": 259,
"label": "MA-occupancysensor",
- "name": "MA-occupancysensor"
+ "name": "MA-occupancysensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 263,
"profileId": 259,
"label": "MA-occupancysensor",
- "name": "MA-occupancysensor"
+ "name": "MA-occupancysensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index 36b41b5..7d494cb 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap
index 23543f0..95cb467 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.zap
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3340,22 +3344,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index a4823ec..af688a1 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 259,
"profileId": 259,
"label": "MA-onofflightswitch",
- "name": "MA-onofflightswitch"
+ "name": "MA-onofflightswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 259,
"profileId": 259,
"label": "MA-onofflightswitch",
- "name": "MA-onofflightswitch"
+ "name": "MA-onofflightswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index b13e31c..fb0dcdc 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 266,
"profileId": 259,
"label": "MA-onoffpluginunit",
- "name": "MA-onoffpluginunit"
+ "name": "MA-onoffpluginunit",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 266,
"profileId": 259,
"label": "MA-onoffpluginunit",
- "name": "MA-onoffpluginunit"
+ "name": "MA-onoffpluginunit",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index f473e3d..de963bf 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2349,14 +2351,16 @@
"code": 773,
"profileId": 259,
"label": "MA-pressuresensor",
- "name": "MA-pressuresensor"
+ "name": "MA-pressuresensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 773,
"profileId": 259,
"label": "MA-pressuresensor",
- "name": "MA-pressuresensor"
+ "name": "MA-pressuresensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2830,4 +2834,4 @@
"parentEndpointIdentifier": null
}
]
-}
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap
index a64d2c9..15aff7e 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.zap
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2158,14 +2160,16 @@
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2975,22 +2979,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3129,22 +3117,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3283,22 +3255,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
index dba461f..e42dbfc 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2158,14 +2160,16 @@
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
index c2f352d..3d1e207 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2670,14 +2672,16 @@
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
- "name": "MA-refrigerator"
+ "name": "MA-refrigerator",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
- "name": "MA-refrigerator"
+ "name": "MA-refrigerator",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2935,22 +2939,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3089,22 +3077,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3172,14 +3144,16 @@
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3615,22 +3589,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3689,14 +3647,16 @@
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4132,22 +4092,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 202206a..243d63a 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1928,20 +1930,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 116,
"profileId": 259,
"label": "MA-robotic-vacuum-cleaner",
- "name": "MA-robotic-vacuum-cleaner"
+ "name": "MA-robotic-vacuum-cleaner",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2047,22 +2052,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2251,22 +2240,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2421,22 +2394,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2639,22 +2596,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2795,22 +2736,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2951,22 +2876,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3179,22 +3088,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
index f322621..5103c29 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1928,14 +1930,16 @@
"code": 114,
"profileId": 259,
"label": "MA-room-airconditioner",
- "name": "MA-room-airconditioner"
+ "name": "MA-room-airconditioner",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 114,
"profileId": 259,
"label": "MA-room-airconditioner",
- "name": "MA-room-airconditioner"
+ "name": "MA-room-airconditioner",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2039,22 +2043,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2375,22 +2363,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2545,22 +2517,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2885,22 +2841,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3113,22 +3053,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3251,22 +3175,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3325,14 +3233,16 @@
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3436,22 +3346,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3606,22 +3500,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3760,22 +3638,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3834,14 +3696,16 @@
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 775,
"profileId": 259,
"label": "MA-humiditysensor",
- "name": "MA-humiditysensor"
+ "name": "MA-humiditysensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3945,22 +3809,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4115,22 +3963,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4269,22 +4101,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
index 41d0fde..3bfa89f 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1928,20 +1930,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 118,
"profileId": 259,
"label": "MA-smokecoalarm",
- "name": "MA-smokecoalarm"
+ "name": "MA-smokecoalarm",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2047,22 +2052,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2405,22 +2394,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2623,22 +2596,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2956,22 +2913,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 9c2bea2..985a8ba 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 34,
"profileId": 259,
"label": "MA-speaker",
- "name": "MA-speaker"
+ "name": "MA-speaker",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 34,
"profileId": 259,
"label": "MA-speaker",
- "name": "MA-speaker"
+ "name": "MA-speaker",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 0395fbd..41b9d8e 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index 90c1074..fe60e58 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2455,14 +2457,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap
index 34e2b90..ff3b777 100644
--- a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap
+++ b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -2060,22 +2060,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2264,22 +2248,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2434,22 +2402,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2748,22 +2700,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2870,22 +2806,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2976,22 +2896,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter
index 7105d99..017be59 100644
--- a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter
+++ b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.matter
@@ -1777,8 +1777,8 @@
}
}
endpoint 1 {
- device type ma_powersource = 66, version 1;
- device type ma_water_valve = 17, version 1;
+ device type ma_powersource = 17, version 1;
+ device type ma_water_valve = 66, version 1;
server cluster Identify {
diff --git a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap
index ba64c26..398645c 100644
--- a/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap
+++ b/examples/chef/devices/rootnode_watervalve_6bb39f1f67.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -795,22 +797,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2074,20 +2060,23 @@
"code": 66,
"profileId": 259,
"label": "MA-water-valve",
- "name": "MA-water-valve"
+ "name": "MA-water-valve",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 66,
"profileId": 259,
"label": "MA-water-valve",
- "name": "MA-water-valve"
+ "name": "MA-water-valve",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2095,8 +2084,8 @@
1
],
"deviceIdentifiers": [
- 17,
- 66
+ 66,
+ 17
],
"deviceTypeName": "MA-water-valve",
"deviceTypeCode": 66,
@@ -2193,22 +2182,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2363,22 +2336,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2693,22 +2650,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2897,22 +2838,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 23e4836..e608fff 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2291,14 +2293,16 @@
"code": 514,
"profileId": 259,
"label": "MA-windowcovering",
- "name": "MA-windowcovering"
+ "name": "MA-windowcovering",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 514,
"profileId": 259,
"label": "MA-windowcovering",
- "name": "MA-windowcovering"
+ "name": "MA-windowcovering",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap
index 2eec446..807be8c 100644
--- a/examples/chef/devices/template.zap
+++ b/examples/chef/devices/template.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1936,14 +1938,16 @@
"code": 4293984259,
"profileId": 259,
"label": "MA-all-clusters-app",
- "name": "MA-all-clusters-app"
+ "name": "MA-all-clusters-app",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 4293984259,
"profileId": 259,
"label": "MA-all-clusters-app",
- "name": "MA-all-clusters-app"
+ "name": "MA-all-clusters-app",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2047,22 +2051,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2251,22 +2239,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2421,22 +2393,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap
index bce092c..f7e49f3 100644
--- a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -3857,10 +3857,10 @@
"side": "server",
"type": "OperatingModeEnum",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3937,10 +3937,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x000f",
+ "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 1aac341..1bea47c 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4028,14 +4030,16 @@
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
index 6658c27..6f1610e 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -3840,10 +3840,10 @@
"side": "server",
"type": "OperatingModeEnum",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3920,10 +3920,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x000F",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
index 3110fe0..a9d4fff 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -3766,10 +3766,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
index 857f5a0..2319169 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2802,14 +2804,16 @@
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap
index f7927d1..53cba02 100644
--- a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap
+++ b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -747,24 +749,6 @@
"isIncoming": 0,
"isEnabled": 1
}
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
]
},
{
@@ -3644,14 +3628,16 @@
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3755,22 +3741,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3925,22 +3895,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4259,22 +4213,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4333,14 +4271,16 @@
"code": 1296,
"profileId": 259,
"label": "MA-electricalsensor",
- "name": "MA-electricalsensor"
+ "name": "MA-electricalsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 1296,
"profileId": 259,
"label": "MA-electricalsensor",
- "name": "MA-electricalsensor"
+ "name": "MA-electricalsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4458,22 +4398,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4868,22 +4792,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5031,22 +4939,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5178,22 +5070,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5252,14 +5128,16 @@
"code": 1293,
"profileId": 259,
"label": "Device Energy Management",
- "name": "Device Energy Management"
+ "name": "Device Energy Management",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 1293,
"profileId": 259,
"label": "Device Energy Management",
- "name": "Device Energy Management"
+ "name": "Device Energy Management",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -5377,22 +5255,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5678,22 +5540,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5833,38 +5679,6 @@
"reportableChange": 0
},
{
- "name": "StartUpMode",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "OnMode",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -5897,22 +5711,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap
index 61d3ad5..0b92935 100644
--- a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap
+++ b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 100,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -747,24 +749,6 @@
"isIncoming": 0,
"isEnabled": 1
}
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
]
},
{
@@ -1936,7 +1920,7 @@
]
},
{
- "name": "WiFi Network Diagnostics",
+ "name": "Wi-Fi Network Diagnostics",
"code": 54,
"mfgCode": null,
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
@@ -2828,14 +2812,16 @@
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 117,
"profileId": 259,
"label": "MA-dishwasher",
- "name": "MA-dishwasher"
+ "name": "MA-dishwasher",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2939,22 +2925,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3109,22 +3079,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3443,22 +3397,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3517,14 +3455,16 @@
"code": 1296,
"profileId": 259,
"label": "MA-electricalsensor",
- "name": "MA-electricalsensor"
+ "name": "MA-electricalsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 1296,
"profileId": 259,
"label": "MA-electricalsensor",
- "name": "MA-electricalsensor"
+ "name": "MA-electricalsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3642,22 +3582,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3714,7 +3638,6 @@
"define": "ELECTRICAL_POWER_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "apiMaturity": "provisional",
"attributes": [
{
"name": "PowerMode",
@@ -4053,22 +3976,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4134,7 +4041,6 @@
"define": "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "apiMaturity": "provisional",
"attributes": [
{
"name": "Accuracy",
@@ -4217,22 +4123,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4298,7 +4188,6 @@
"define": "POWER_TOPOLOGY_CLUSTER",
"side": "server",
"enabled": 1,
- "apiMaturity": "provisional",
"attributes": [
{
"name": "AvailableEndpoints",
@@ -4365,22 +4254,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4439,14 +4312,16 @@
"code": 1293,
"profileId": 259,
"label": "Device Energy Management",
- "name": "Device Energy Management"
+ "name": "Device Energy Management",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 1293,
"profileId": 259,
"label": "Device Energy Management",
- "name": "Device Energy Management"
+ "name": "Device Energy Management",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4564,22 +4439,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4605,7 +4464,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4621,7 +4480,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4789,7 +4648,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "PowerAdjustCapabilityStruct",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4865,22 +4724,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5020,38 +4863,6 @@
"reportableChange": 0
},
{
- "name": "StartUpMode",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "OnMode",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -5084,22 +4895,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5125,7 +4920,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.zap b/examples/energy-management-app/energy-management-common/energy-management-app.zap
index ee365c7..9a1f454 100644
--- a/examples/energy-management-app/energy-management-common/energy-management-app.zap
+++ b/examples/energy-management-app/energy-management-common/energy-management-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
index 6537421..c023f88 100644
--- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
+++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3979,14 +3981,16 @@
"code": 14,
"profileId": 259,
"label": "MA-aggregator",
- "name": "MA-aggregator"
+ "name": "MA-aggregator",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 14,
"profileId": 259,
"label": "MA-aggregator",
- "name": "MA-aggregator"
+ "name": "MA-aggregator",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4353,7 +4357,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4369,23 +4373,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4401,7 +4389,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/fabric-sync/bridge/fabric-bridge.zap b/examples/fabric-sync/bridge/fabric-bridge.zap
index 6537421..dfaf713 100644
--- a/examples/fabric-sync/bridge/fabric-bridge.zap
+++ b/examples/fabric-sync/bridge/fabric-bridge.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3979,14 +3981,16 @@
"code": 14,
"profileId": 259,
"label": "MA-aggregator",
- "name": "MA-aggregator"
+ "name": "MA-aggregator",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 14,
"profileId": 259,
"label": "MA-aggregator",
- "name": "MA-aggregator"
+ "name": "MA-aggregator",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4353,7 +4357,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4369,23 +4373,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4401,7 +4389,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
index 9a8d968..1cbadd0 100644
--- a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
+++ b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -3880,22 +3880,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4002,22 +3986,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4124,22 +4092,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4246,22 +4198,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4434,22 +4370,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4604,22 +4524,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4752,22 +4656,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4996,22 +4884,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5098,4 +4970,4 @@
"parentEndpointIdentifier": null
}
]
-}
+}
\ No newline at end of file
diff --git a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap
index bc81c51..5439660 100644
--- a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -4493,10 +4493,10 @@
"side": "server",
"type": "OperatingModeEnum",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4525,10 +4525,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "15",
+ "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 595b0d8..d0f7a6a 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4369,10 +4371,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4405,14 +4407,16 @@
"code": 259,
"profileId": 259,
"label": "MA-onofflightswitch",
- "name": "MA-onofflightswitch"
+ "name": "MA-onofflightswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 259,
"profileId": 259,
"label": "MA-onofflightswitch",
- "name": "MA-onofflightswitch"
+ "name": "MA-onofflightswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -5175,14 +5179,16 @@
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/light-switch-app/qpg/zap/switch.zap b/examples/light-switch-app/qpg/zap/switch.zap
index 5e0a547..5553d5e 100644
--- a/examples/light-switch-app/qpg/zap/switch.zap
+++ b/examples/light-switch-app/qpg/zap/switch.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -166,22 +168,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -352,22 +338,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -810,22 +780,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1063,22 +1017,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1384,22 +1322,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1620,22 +1542,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1952,22 +1858,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2076,22 +1966,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2546,22 +2420,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3622,22 +3480,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3802,22 +3644,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4102,22 +3928,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4322,22 +4132,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4444,22 +4238,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4566,22 +4344,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4816,10 +4578,10 @@
"side": "server",
"type": "OperatingModeEnum",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4858,22 +4620,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4896,10 +4642,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0007",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4932,14 +4678,16 @@
"code": 261,
"profileId": 259,
"label": "MA-colordimmerswitch",
- "name": "MA-colordimmerswitch"
+ "name": "MA-colordimmerswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 261,
"profileId": 259,
"label": "MA-colordimmerswitch",
- "name": "MA-colordimmerswitch"
+ "name": "MA-colordimmerswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -5069,22 +4817,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5479,22 +5211,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5601,22 +5317,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5808,14 +5508,16 @@
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 15,
"profileId": 259,
"label": "MA-genericswitch",
- "name": "MA-genericswitch"
+ "name": "MA-genericswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -5919,22 +5621,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6089,22 +5775,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6243,22 +5913,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap
index 986b06e..48cfce3 100644
--- a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap
+++ b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
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 5115fe9..5e2fb2a 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2444,14 +2446,16 @@
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 f3e9a7c..6298c0f 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3420,14 +3422,16 @@
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 2afef08..711fa38 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2627,14 +2629,16 @@
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index e714f74..1195ca2 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
+ },
+ {
+ "pathRelativity": "relativeToZap",
+ "path": "../../../src/app/zap-templates/app-templates.json",
+ "type": "gen-templates-json",
+ "category": "matter",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3992,14 +3994,16 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index f8293b8..602644e 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2985,14 +2987,16 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index b744892..c6b7757 100644
--- a/examples/lighting-app/qpg/zap/light.zap
+++ b/examples/lighting-app/qpg/zap/light.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4118,14 +4120,16 @@
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 6e7931f..c8c15db 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3103,14 +3105,16 @@
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 269,
"profileId": 259,
"label": "MA-extendedcolorlight",
- "name": "MA-extendedcolorlight"
+ "name": "MA-extendedcolorlight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3214,22 +3218,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3418,22 +3406,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3654,22 +3626,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4050,22 +4006,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4220,22 +4160,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4481,22 +4405,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5077,22 +4985,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 a0b64b7..36a9bde 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2580,20 +2582,23 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2699,22 +2704,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2903,22 +2892,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3139,22 +3112,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3535,22 +3492,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3705,22 +3646,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3987,22 +3912,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4256,22 +4165,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 18c561c..db31e23 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -174,22 +177,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -360,22 +347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -715,22 +686,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1011,22 +966,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1247,22 +1186,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1555,22 +1478,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1751,22 +1658,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2555,22 +2446,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2855,22 +2730,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3075,22 +2934,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3441,10 +3284,10 @@
"side": "server",
"type": "OperatingModeEnum",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3499,22 +3342,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3537,10 +3364,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x000F",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3573,14 +3400,16 @@
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 21,
"profileId": 259,
"label": "MA-contactsensor",
- "name": "MA-contactsensor"
+ "name": "MA-contactsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3684,22 +3513,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3854,22 +3667,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3976,22 +3773,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 07c256d..26b5479 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -4643,10 +4643,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index e888db4..0656272 100644
--- a/examples/lock-app/nxp/zap/lock-app.zap
+++ b/examples/lock-app/nxp/zap/lock-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -96,7 +98,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -112,7 +114,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -128,7 +130,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -166,22 +168,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -250,7 +236,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -266,7 +252,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -352,22 +338,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -452,7 +422,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -468,7 +438,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -484,7 +454,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -500,7 +470,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -516,7 +486,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -532,7 +502,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -548,7 +518,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -564,7 +534,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -580,7 +550,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -596,7 +566,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -612,7 +582,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -714,22 +684,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -967,22 +921,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1074,7 +1012,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -1090,7 +1028,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -1128,22 +1066,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1364,22 +1286,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1696,22 +1602,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1820,22 +1710,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1962,7 +1836,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -2032,22 +1906,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3233,22 +3091,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3405,22 +3247,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3705,22 +3531,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3925,22 +3735,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4079,22 +3873,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4117,10 +3895,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4153,14 +3931,16 @@
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4264,22 +4044,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4434,22 +4198,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5318,22 +5066,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index f8a1eee..d201f86 100644
--- a/examples/lock-app/qpg/zap/lock.zap
+++ b/examples/lock-app/qpg/zap/lock.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4198,22 +4200,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4236,10 +4222,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4272,14 +4258,16 @@
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/lock-app/silabs/data_model/lock-app.zap b/examples/lock-app/silabs/data_model/lock-app.zap
index e3488a6..72c0be5 100644
--- a/examples/lock-app/silabs/data_model/lock-app.zap
+++ b/examples/lock-app/silabs/data_model/lock-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -174,22 +177,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -360,22 +347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -818,22 +789,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1136,22 +1091,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1338,22 +1277,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1583,22 +1506,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1891,22 +1798,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2227,22 +2118,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4084,22 +3959,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4384,22 +4243,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4604,22 +4447,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4848,10 +4675,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4884,20 +4711,23 @@
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 10,
"profileId": 259,
"label": "MA-doorlock",
- "name": "MA-doorlock"
+ "name": "MA-doorlock",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -5003,22 +4833,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5173,22 +4987,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5423,22 +5221,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6147,22 +5929,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap
index dff2d9f..4291a37 100644
--- a/examples/log-source-app/log-source-common/log-source-app.zap
+++ b/examples/log-source-app/log-source-common/log-source-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 4293984259,
"profileId": 259,
"label": "MA-all-clusters-app",
- "name": "MA-all-clusters-app"
+ "name": "MA-all-clusters-app",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 4293984259,
"profileId": 259,
"label": "MA-all-clusters-app",
- "name": "MA-all-clusters-app"
+ "name": "MA-all-clusters-app",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 0311328..cea8cf7 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -794,22 +796,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2678,14 +2664,16 @@
"code": 121,
"profileId": 259,
"label": "MA-microwave-oven",
- "name": "MA-microwave-oven"
+ "name": "MA-microwave-oven",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 121,
"profileId": 259,
"label": "MA-microwave-oven",
- "name": "MA-microwave-oven"
+ "name": "MA-microwave-oven",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2943,22 +2931,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3081,22 +3053,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3317,22 +3273,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3561,22 +3501,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.zap b/examples/network-manager-app/network-manager-common/network-manager-app.zap
index dd4232b..98816f9 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.zap
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
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 eb62148..909d520 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 ab924da..628714c 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 18,
"profileId": 259,
"label": "MA-otarequestor",
- "name": "MA-otarequestor"
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 18,
"profileId": 259,
"label": "MA-otarequestor",
- "name": "MA-otarequestor"
+ "name": "MA-otarequestor",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -174,22 +177,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -360,22 +347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -818,22 +789,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1071,22 +1026,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1330,22 +1269,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1638,22 +1561,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1914,22 +1821,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2103,22 +1994,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2403,22 +2278,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2623,22 +2482,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2813,14 +2656,16 @@
"code": 259,
"profileId": 259,
"label": "MA-onofflightswitch",
- "name": "MA-onofflightswitch"
+ "name": "MA-onofflightswitch",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 259,
"profileId": 259,
"label": "MA-onofflightswitch",
- "name": "MA-onofflightswitch"
+ "name": "MA-onofflightswitch",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3400,14 +3245,16 @@
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3525,22 +3372,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3833,22 +3664,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 248e02c..7db61d0 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -174,22 +177,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -360,22 +347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -869,22 +840,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1030,22 +985,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1184,22 +1123,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1290,22 +1213,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1908,22 +1815,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2178,22 +2069,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2486,22 +2361,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2762,22 +2621,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5065,22 +4908,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5439,22 +5266,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5659,22 +5470,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -10899,14 +10694,16 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -14241,10 +14038,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -14289,10 +14086,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -14337,10 +14134,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -14592,22 +14389,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 463c73a..4c43d0b 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -174,22 +177,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -360,22 +347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -869,22 +840,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1030,22 +985,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1184,22 +1123,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1306,22 +1229,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1924,22 +1831,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2194,22 +2085,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2502,22 +2377,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2778,22 +2637,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5081,22 +4924,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5455,22 +5282,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5675,22 +5486,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -10981,14 +10776,16 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -14053,10 +13850,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -14101,10 +13898,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -14149,10 +13946,10 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 4e4fe65..eecdab3 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2797,14 +2799,16 @@
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 e26ba1c..92a8598 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2797,14 +2799,16 @@
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 e26ba1c..6999a74 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2797,14 +2799,16 @@
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 771,
"profileId": 2457,
"label": "MA-pump",
- "name": "MA-pump"
+ "name": "MA-pump",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
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 9ef65ce..eb9a189 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2797,14 +2799,16 @@
"code": 772,
"profileId": 2457,
"label": "MA-pumpcontroller",
- "name": "MA-pumpcontroller"
+ "name": "MA-pumpcontroller",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 772,
"profileId": 2457,
"label": "MA-pumpcontroller",
- "name": "MA-pumpcontroller"
+ "name": "MA-pumpcontroller",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
index 3040a2f..ea0092c 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2662,14 +2664,16 @@
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
- "name": "MA-refrigerator"
+ "name": "MA-refrigerator",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
- "name": "MA-refrigerator"
+ "name": "MA-refrigerator",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2845,14 +2849,16 @@
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3176,14 +3182,16 @@
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
- "name": "MA-temperature-controlled-cabinet"
+ "name": "MA-temperature-controlled-cabinet",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
index 47a8600..a322e74 100644
--- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
+++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -3087,7 +3087,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3103,7 +3103,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3119,7 +3119,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap
index d8bb822..b2681e6 100644
--- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap
+++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
+ },
+ {
+ "pathRelativity": "relativeToZap",
+ "path": "../../../../src/app/zap-templates/app-templates.json",
+ "type": "gen-templates-json",
+ "category": "matter",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -2992,7 +2992,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3008,7 +3008,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3024,7 +3024,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index 7706866..4e44252 100644
--- a/examples/rvc-app/rvc-common/rvc-app.zap
+++ b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1518,22 +1520,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1984,14 +1970,16 @@
"code": 116,
"profileId": 259,
"label": "MA-robotic-vacuum-cleaner",
- "name": "MA-robotic-vacuum-cleaner"
+ "name": "MA-robotic-vacuum-cleaner",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 116,
"profileId": 259,
"label": "MA-robotic-vacuum-cleaner",
- "name": "MA-robotic-vacuum-cleaner"
+ "name": "MA-robotic-vacuum-cleaner",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2095,22 +2083,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2265,22 +2237,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2421,22 +2377,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2577,22 +2517,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2797,22 +2721,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3050,22 +2958,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 c6da2cc..7114584 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3514,10 +3516,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3550,20 +3552,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 118,
"profileId": 259,
"label": "MA-smokecoalarm",
- "name": "MA-smokecoalarm"
+ "name": "MA-smokecoalarm",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -3669,22 +3674,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3979,22 +3968,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4197,22 +4170,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4530,22 +4487,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
index 691a28b..110f2a7 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -1436,22 +1438,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2882,14 +2868,16 @@
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 770,
"profileId": 259,
"label": "MA-tempsensor",
- "name": "MA-tempsensor"
+ "name": "MA-tempsensor",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap b/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap
index b3f5c2d..76846ef 100644
--- a/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap
+++ b/examples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -2500,7 +2500,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2516,7 +2516,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2532,7 +2532,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2548,7 +2548,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2564,7 +2564,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2580,7 +2580,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2596,7 +2596,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2612,7 +2612,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2628,7 +2628,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.zap b/examples/thermostat/nxp/zap/thermostat_matter_br.zap
index 02efbc7..116d8d4 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_br.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_br.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,18 +19,18 @@
"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",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "category": "matter",
- "version": "chip-v1"
}
],
"endpointTypes": [
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
index 2542a80..e39b0cb 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
index da639e7..2de2e08 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 104,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap
index 82b782d..ba12f9f 100644
--- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap
+++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3499,14 +3501,16 @@
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
- "name": "MA-thermostat"
+ "name": "MA-thermostat",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 2a282af..8235918 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -107,7 +107,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -123,7 +123,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -139,7 +139,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -154,7 +154,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -170,7 +170,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -186,7 +186,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -303,7 +303,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -366,7 +366,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -382,7 +382,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -473,7 +473,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -489,7 +489,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -505,7 +505,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -521,7 +521,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -537,7 +537,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -553,7 +553,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": "",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -569,7 +569,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -585,7 +585,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -601,7 +601,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -617,7 +617,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -633,7 +633,7 @@
"singleton": 1,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
@@ -808,7 +808,7 @@
"storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -824,7 +824,7 @@
"storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -840,7 +840,7 @@
"storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1045,7 +1045,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1061,7 +1061,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1077,7 +1077,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1159,7 +1159,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "en-US",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -1175,7 +1175,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -1190,7 +1190,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1206,7 +1206,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1222,7 +1222,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1281,7 +1281,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -1526,7 +1526,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1542,7 +1542,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1558,7 +1558,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1786,7 +1786,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1802,7 +1802,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1818,7 +1818,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1995,7 +1995,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": null,
- "reportable": 0,
+ "reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
@@ -2106,7 +2106,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2122,7 +2122,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2138,7 +2138,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3916,7 +3916,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3932,7 +3932,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3948,7 +3948,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4200,7 +4200,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4216,7 +4216,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4232,7 +4232,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4404,7 +4404,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4420,7 +4420,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4436,7 +4436,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
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 09f5a2e..ba281bf 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2040,14 +2042,16 @@
"code": 145,
"profileId": 259,
"label": "MA-thread-border-router",
- "name": "MA-thread-border-router"
+ "name": "MA-thread-border-router",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 145,
"profileId": 259,
"label": "MA-thread-border-router",
- "name": "MA-thread-border-router"
+ "name": "MA-thread-border-router",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2165,22 +2169,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2543,22 +2531,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2788,22 +2760,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 3ea4adf..2579ea8 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4394,14 +4396,16 @@
"code": 35,
"profileId": 259,
"label": "MA-casting-videoplayer",
- "name": "MA-casting-videoplayer"
+ "name": "MA-casting-videoplayer",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 35,
"profileId": 259,
"label": "MA-casting-videoplayer",
- "name": "MA-casting-videoplayer"
+ "name": "MA-casting-videoplayer",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4696,22 +4700,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6316,22 +6304,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6399,14 +6371,16 @@
"code": 34,
"profileId": 259,
"label": "MA-speaker",
- "name": "MA-speaker"
+ "name": "MA-speaker",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 34,
"profileId": 259,
"label": "MA-speaker",
- "name": "MA-speaker"
+ "name": "MA-speaker",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -6950,14 +6924,16 @@
"code": 36,
"profileId": 259,
"label": "MA-contentapp",
- "name": "MA-contentapp"
+ "name": "MA-contentapp",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 36,
"profileId": 259,
"label": "MA-contentapp",
- "name": "MA-contentapp"
+ "name": "MA-contentapp",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -7133,22 +7109,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -8761,22 +8721,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 6f4ab13..103d4d3 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -2715,14 +2717,16 @@
"code": 41,
"profileId": 259,
"label": "MA-casting-videoclient",
- "name": "MA-casting-videoclient"
+ "name": "MA-casting-videoclient",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 41,
"profileId": 259,
"label": "MA-casting-videoclient",
- "name": "MA-casting-videoclient"
+ "name": "MA-casting-videoclient",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -3983,22 +3987,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
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 16a11f8..c2a90d6 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4074,14 +4076,16 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4821,22 +4825,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5066,22 +5054,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6200,22 +6172,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6524,22 +6480,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
diff --git a/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap b/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap
index 1dc7adb..d311a96 100644
--- a/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap
+++ b/examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -795,22 +797,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2074,20 +2060,23 @@
"code": 67,
"profileId": 259,
"label": "MA-water-leak-detector",
- "name": "MA-water-leak-detector"
+ "name": "MA-water-leak-detector",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 67,
"profileId": 259,
"label": "MA-water-leak-detector",
- "name": "MA-water-leak-detector"
+ "name": "MA-water-leak-detector",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -2193,22 +2182,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2397,22 +2370,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2567,22 +2524,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2897,22 +2838,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3019,22 +2944,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3125,22 +3034,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -3211,4 +3104,4 @@
"parentEndpointIdentifier": 0
}
]
-}
+}
\ No newline at end of file
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 64f9a63..a23d00e 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -174,22 +177,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -360,22 +347,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -818,22 +789,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1136,22 +1091,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1402,22 +1341,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1638,22 +1561,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1946,22 +1853,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2222,22 +2113,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4048,22 +3923,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4348,22 +4207,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4568,22 +4411,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4838,22 +4665,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -4876,10 +4687,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4912,14 +4723,16 @@
"code": 514,
"profileId": 259,
"label": "MA-windowcovering",
- "name": "MA-windowcovering"
+ "name": "MA-windowcovering",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 514,
"profileId": 259,
"label": "MA-windowcovering",
- "name": "MA-windowcovering"
+ "name": "MA-windowcovering",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -5923,14 +5736,16 @@
"code": 514,
"profileId": 259,
"label": "MA-windowcovering",
- "name": "MA-windowcovering"
+ "name": "MA-windowcovering",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 514,
"profileId": 259,
"label": "MA-windowcovering",
- "name": "MA-windowcovering"
+ "name": "MA-windowcovering",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index 77c492d..fe24534 100644
--- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap
+++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,20 +41,23 @@
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 0
},
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -330,22 +333,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -574,22 +561,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1048,22 +1019,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1390,22 +1345,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1544,22 +1483,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1666,22 +1589,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -1942,22 +1849,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2178,22 +2069,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2534,22 +2409,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2658,22 +2517,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -2950,22 +2793,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5193,22 +5020,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5493,22 +5304,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -5713,22 +5508,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6102,20 +5881,23 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -6221,22 +6003,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6425,22 +6191,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -6695,22 +6445,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7213,22 +6947,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -7579,22 +7297,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -8089,22 +7791,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -8261,22 +7947,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -8399,22 +8069,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -9125,22 +8779,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -9281,22 +8919,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -9437,22 +9059,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -10652,22 +10258,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11132,22 +10722,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -11425,22 +10999,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -12069,22 +11627,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -12385,22 +11927,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -12811,22 +12337,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -13022,22 +12532,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -13339,22 +12833,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -13813,22 +13291,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -14044,22 +13506,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -14182,22 +13628,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -14338,22 +13768,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -14495,22 +13909,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -15937,22 +15335,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -22698,20 +22080,23 @@
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
- "name": "MA-onofflight"
+ "name": "MA-onofflight",
+ "deviceTypeOrder": 0
},
{
"code": 17,
"profileId": 259,
"label": "MA-powersource",
- "name": "MA-powersource"
+ "name": "MA-powersource",
+ "deviceTypeOrder": 1
}
],
"deviceVersions": [
@@ -22817,22 +22202,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -23021,22 +22390,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -23257,22 +22610,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -23443,22 +22780,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -23661,22 +22982,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -23938,22 +23243,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -24102,14 +23391,16 @@
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 25,
"profileId": 259,
"label": "MA-secondary-network-interface",
- "name": "MA-secondary-network-interface"
+ "name": "MA-secondary-network-interface",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -24227,22 +23518,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -24535,22 +23810,6 @@
"reportableChange": 0
},
{
- "name": "EventList",
- "code": 65530,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
@@ -24637,4 +23896,4 @@
"parentEndpointIdentifier": null
}
]
-}
+}
\ No newline at end of file
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index 808a1e7..309f8f6 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
@@ -4156,14 +4158,16 @@
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
- "name": "MA-dimmablelight"
+ "name": "MA-dimmablelight",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 8c1eba9..87ef155 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
- "featureLevel": 103,
+ "featureLevel": 106,
"creator": "zap",
"keyValuePairs": [
{
@@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
- "name": "MA-rootdevice"
+ "name": "MA-rootdevice",
+ "deviceTypeOrder": 0
}
],
"deviceVersions": [
