Align XML with spec - Update Color control revision (#28763)
* Update colorcontrol cluster revision to 6, with scripts/tools/zap/update_cluster_revisions.py --cluster-id 0x0300 --new-revision 6 --old-revision 5
* run regen_all
* rebase and fix conflicts
* rebase and fix conflict 2
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 8a03eb4..e38e25e 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,5 +1,5 @@
{
- "featureLevel": 96,
+ "featureLevel": 97,
"creator": "zap",
"keyValuePairs": [
{
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -2671,7 +2697,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2687,7 +2713,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2703,7 +2729,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2719,7 +2745,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5509,7 +5535,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 46,
+ "code": 44,
+ "profileId": 259,
+ "label": "MA-air-quality-sensor",
+ "name": "MA-air-quality-sensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 46,
+ "code": 44,
+ "profileId": 259,
+ "label": "MA-air-quality-sensor",
+ "name": "MA-air-quality-sensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 46
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 44
+ ],
"deviceTypeName": "MA-air-quality-sensor",
"deviceTypeCode": 44,
"deviceTypeProfileId": 259,
@@ -9541,18 +9593,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 44
+ "networkId": 0
}
],
"log": []
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index b911be8..7fbee28 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -7090,7 +7090,7 @@
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster BallastConfiguration {
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 f92b658..10b38ca 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
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 24,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
@@ -8653,7 +8653,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -9479,7 +9479,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -10512,7 +10512,7 @@
]
},
{
- "id": 21,
+ "id": 2,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
@@ -21612,7 +21612,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -22486,7 +22486,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -30401,7 +30401,7 @@
]
},
{
- "id": 23,
+ "id": 3,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
@@ -33616,7 +33616,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -34442,7 +34442,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -34685,7 +34685,7 @@
]
},
{
- "id": 22,
+ "id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 53,
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index aab1d71..6133207 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -4508,7 +4508,7 @@
ram attribute enhancedColorMode default = 0x01;
ram attribute colorCapabilities default = 0x1F;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster BallastConfiguration {
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 0fa2997..604607c 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
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 12,
+ "id": 2,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
@@ -949,7 +949,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -965,7 +965,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -981,7 +981,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -997,7 +997,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1013,7 +1013,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1277,7 +1277,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1293,7 +1293,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1309,7 +1309,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1325,7 +1325,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1754,7 +1754,7 @@
"side": "server",
"type": "ProductAppearanceStruct",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1770,7 +1770,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1786,7 +1786,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1802,7 +1802,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1818,7 +1818,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2268,7 +2268,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2284,7 +2284,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2300,7 +2300,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2316,7 +2316,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2496,7 +2496,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2628,7 +2628,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2644,7 +2644,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2660,7 +2660,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2676,7 +2676,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3386,7 +3386,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3634,7 +3634,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3650,7 +3650,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3666,7 +3666,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3682,7 +3682,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3986,7 +3986,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4002,7 +4002,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4018,7 +4018,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4382,7 +4382,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6390,7 +6390,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6406,7 +6406,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6422,7 +6422,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6438,7 +6438,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6734,7 +6734,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6750,7 +6750,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6766,7 +6766,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6782,7 +6782,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6998,7 +6998,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7014,7 +7014,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7030,7 +7030,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7046,7 +7046,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7845,7 +7845,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8671,7 +8671,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -9554,7 +9554,7 @@
]
},
{
- "id": 14,
+ "id": 1,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
@@ -9702,7 +9702,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9718,7 +9718,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9734,7 +9734,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9750,7 +9750,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9950,7 +9950,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9966,7 +9966,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9982,7 +9982,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9998,7 +9998,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10334,7 +10334,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10350,7 +10350,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10366,7 +10366,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10382,7 +10382,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10644,7 +10644,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11446,7 +11446,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11462,7 +11462,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11478,7 +11478,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11494,7 +11494,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11510,7 +11510,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -12906,7 +12906,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -17180,7 +17180,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -18054,7 +18054,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -22799,7 +22799,7 @@
]
},
{
- "id": 13,
+ "id": 4,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 8,
@@ -22947,7 +22947,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22963,7 +22963,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22979,7 +22979,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22995,7 +22995,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23195,7 +23195,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23211,7 +23211,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23227,7 +23227,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23243,7 +23243,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23563,7 +23563,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23579,7 +23579,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23595,7 +23595,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23611,7 +23611,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23627,7 +23627,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23857,7 +23857,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23873,7 +23873,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23889,7 +23889,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23905,7 +23905,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24251,7 +24251,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24267,7 +24267,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24283,7 +24283,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24299,7 +24299,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24315,7 +24315,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -25331,7 +25331,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -26014,7 +26014,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -26840,7 +26840,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -27083,7 +27083,7 @@
]
},
{
- "id": 15,
+ "id": 3,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 53,
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 51a214d..23e7238 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-bridge",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5018,7 +5044,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 6,
+ "code": 14,
+ "profileId": 259,
+ "label": "MA-aggregator",
+ "name": "MA-aggregator"
+ },
+ "deviceTypes": [
+ {
+ "id": 6,
+ "code": 14,
+ "profileId": 259,
+ "label": "MA-aggregator",
+ "name": "MA-aggregator"
+ }
+ ],
+ "deviceTypeRefs": [
+ 6
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 14
+ ],
"deviceTypeName": "MA-aggregator",
"deviceTypeCode": 14,
"deviceTypeProfileId": 259,
@@ -5751,7 +5803,33 @@
]
},
{
+ "id": 3,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 9
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 257
+ ],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
@@ -7603,27 +7681,21 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 14
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 2,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 257
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index d487930..3d3e8fc 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5417,7 +5443,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 9
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 257
+ ],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
@@ -7501,18 +7553,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 257
+ "networkId": 0
}
],
"log": []
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 9f584e9..95485d6 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
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 3,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -5420,7 +5420,7 @@
]
},
{
- "id": 7,
+ "id": 6,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 45,
@@ -9451,7 +9451,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -10389,7 +10389,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -10936,7 +10936,7 @@
]
},
{
- "id": 4,
+ "id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 46,
@@ -15216,7 +15216,7 @@
]
},
{
- "id": 6,
+ "id": 5,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 24,
@@ -15888,7 +15888,7 @@
]
},
{
- "id": 5,
+ "id": 3,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 27,
@@ -16560,7 +16560,7 @@
]
},
{
- "id": 8,
+ "id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 34,
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index 711eaeb..e6e64d2 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 10,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -5420,7 +5420,7 @@
]
},
{
- "id": 9,
+ "id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 37,
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 090d743..73bdaee 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1779,7 +1779,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x0010;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
}
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index 640d0f3..019dc0f 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 10,
+ "code": 268,
+ "profileId": 259,
+ "label": "MA-colortemperaturelight",
+ "name": "MA-colortemperaturelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 10,
+ "code": 268,
+ "profileId": 259,
+ "label": "MA-colortemperaturelight",
+ "name": "MA-colortemperaturelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 10
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 268
+ ],
"deviceTypeName": "MA-colortemperaturelight",
"deviceTypeCode": 268,
"deviceTypeProfileId": 259,
@@ -7345,7 +7397,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8283,7 +8335,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8300,18 +8352,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 268
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 9eac922..3dcf59c 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 21,
+ "code": 21,
+ "profileId": 259,
+ "label": "MA-contactsensor",
+ "name": "MA-contactsensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 21,
+ "code": 21,
+ "profileId": 259,
+ "label": "MA-contactsensor",
+ "name": "MA-contactsensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 21
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 21
+ ],
"deviceTypeName": "MA-contactsensor",
"deviceTypeCode": 21,
"deviceTypeProfileId": 259,
@@ -6306,18 +6358,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 21
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 1890074..fb42122 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5442,7 +5468,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 9
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 257
+ ],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
@@ -7526,18 +7578,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 257
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index fdfffe1..87dfc87 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 29,
+ "code": 10,
+ "profileId": 259,
+ "label": "MA-doorlock",
+ "name": "MA-doorlock"
+ },
+ "deviceTypes": [
+ {
+ "id": 29,
+ "code": 10,
+ "profileId": 259,
+ "label": "MA-doorlock",
+ "name": "MA-doorlock"
+ }
+ ],
+ "deviceTypeRefs": [
+ 29
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 10
+ ],
"deviceTypeName": "MA-doorlock",
"deviceTypeCode": 10,
"deviceTypeProfileId": 259,
@@ -8036,7 +8088,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8958,7 +9010,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -9299,18 +9351,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 10
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 3be0f99..18b6b18 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1854,7 +1854,7 @@
callback attribute acceptedCommandList default = 0;
callback attribute attributeList default = 0;
ram attribute featureMap default = 0x1f;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
}
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index acc303b..0242e62 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ },
+ "deviceTypes": [
+ {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 11
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 269
+ ],
"deviceTypeName": "MA-extendedcolorlight",
"deviceTypeCode": 269,
"deviceTypeProfileId": 259,
@@ -7333,7 +7385,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8255,7 +8307,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -8596,18 +8648,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 269
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 011ff03..762dfc6 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5442,7 +5468,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 35,
+ "code": 43,
+ "profileId": 259,
+ "label": "MA-fan",
+ "name": "MA-fan"
+ },
+ "deviceTypes": [
+ {
+ "id": 35,
+ "code": 43,
+ "profileId": 259,
+ "label": "MA-fan",
+ "name": "MA-fan"
+ }
+ ],
+ "deviceTypeRefs": [
+ 35
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 43
+ ],
"deviceTypeName": "MA-fan",
"deviceTypeCode": 43,
"deviceTypeProfileId": 259,
@@ -6374,18 +6426,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 43
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index 59abbd4..1597985 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 26,
+ "code": 774,
+ "profileId": 259,
+ "label": "MA-flowsensor",
+ "name": "MA-flowsensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 26,
+ "code": 774,
+ "profileId": 259,
+ "label": "MA-flowsensor",
+ "name": "MA-flowsensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 26
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 774
+ ],
"deviceTypeName": "MA-flowsensor",
"deviceTypeCode": 774,
"deviceTypeProfileId": 259,
@@ -6354,18 +6406,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 774
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 6656177..e80e549 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 33,
+ "code": 768,
+ "profileId": 259,
+ "label": "MA-heatcool",
+ "name": "MA-heatcool"
+ },
+ "deviceTypes": [
+ {
+ "id": 33,
+ "code": 768,
+ "profileId": 259,
+ "label": "MA-heatcool",
+ "name": "MA-heatcool"
+ }
+ ],
+ "deviceTypeRefs": [
+ 33
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 768
+ ],
"deviceTypeName": "MA-heatcool",
"deviceTypeCode": 768,
"deviceTypeProfileId": 259,
@@ -8174,18 +8226,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 768
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 250d24c..361b2e2 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 27,
+ "code": 775,
+ "profileId": 259,
+ "label": "MA-humiditysensor",
+ "name": "MA-humiditysensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 27,
+ "code": 775,
+ "profileId": 259,
+ "label": "MA-humiditysensor",
+ "name": "MA-humiditysensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 27
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 775
+ ],
"deviceTypeName": "MA-humiditysensor",
"deviceTypeCode": 775,
"deviceTypeProfileId": 259,
@@ -6354,18 +6406,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 775
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index 019a461..891c8c0 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 22,
+ "code": 262,
+ "profileId": 259,
+ "label": "MA-lightsensor",
+ "name": "MA-lightsensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 22,
+ "code": 262,
+ "profileId": 259,
+ "label": "MA-lightsensor",
+ "name": "MA-lightsensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 22
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 262
+ ],
"deviceTypeName": "MA-lightsensor",
"deviceTypeCode": 262,
"deviceTypeProfileId": 259,
@@ -6370,18 +6422,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 262
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index e08e37d..b335ca3 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 23,
+ "code": 263,
+ "profileId": 259,
+ "label": "MA-occupancysensor",
+ "name": "MA-occupancysensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 23,
+ "code": 263,
+ "profileId": 259,
+ "label": "MA-occupancysensor",
+ "name": "MA-occupancysensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 23
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 263
+ ],
"deviceTypeName": "MA-occupancysensor",
"deviceTypeCode": 263,
"deviceTypeProfileId": 259,
@@ -6482,18 +6534,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 263
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index 9fc7b0e..d10bd74 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 8,
+ "code": 256,
+ "profileId": 259,
+ "label": "MA-onofflight",
+ "name": "MA-onofflight"
+ },
+ "deviceTypes": [
+ {
+ "id": 8,
+ "code": 256,
+ "profileId": 259,
+ "label": "MA-onofflight",
+ "name": "MA-onofflight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 8
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 256
+ ],
"deviceTypeName": "MA-onofflight",
"deviceTypeCode": 256,
"deviceTypeProfileId": 259,
@@ -7478,18 +7530,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 256
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 20c1653..0f87ab8 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 15,
+ "code": 259,
+ "profileId": 259,
+ "label": "MA-onofflightswitch",
+ "name": "MA-onofflightswitch"
+ },
+ "deviceTypes": [
+ {
+ "id": 15,
+ "code": 259,
+ "profileId": 259,
+ "label": "MA-onofflightswitch",
+ "name": "MA-onofflightswitch"
+ }
+ ],
+ "deviceTypeRefs": [
+ 15
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 259
+ ],
"deviceTypeName": "MA-onofflightswitch",
"deviceTypeCode": 259,
"deviceTypeProfileId": 259,
@@ -7478,18 +7530,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 259
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 68ea6f8..d19660d 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 12,
+ "code": 266,
+ "profileId": 259,
+ "label": "MA-onoffpluginunit",
+ "name": "MA-onoffpluginunit"
+ },
+ "deviceTypes": [
+ {
+ "id": 12,
+ "code": 266,
+ "profileId": 259,
+ "label": "MA-onoffpluginunit",
+ "name": "MA-onoffpluginunit"
+ }
+ ],
+ "deviceTypeRefs": [
+ 12
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 266
+ ],
"deviceTypeName": "MA-onoffpluginunit",
"deviceTypeCode": 266,
"deviceTypeProfileId": 259,
@@ -7154,18 +7206,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 266
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index ad8e113..838e356 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 25,
+ "code": 773,
+ "profileId": 259,
+ "label": "MA-pressuresensor",
+ "name": "MA-pressuresensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 25,
+ "code": 773,
+ "profileId": 259,
+ "label": "MA-pressuresensor",
+ "name": "MA-pressuresensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 25
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 773
+ ],
"deviceTypeName": "MA-pressuresensor",
"deviceTypeCode": 773,
"deviceTypeProfileId": 259,
@@ -6434,18 +6486,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 773
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
index a20540b..f03f076 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -6215,7 +6241,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ },
+ "deviceTypes": [
+ {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ }
+ ],
+ "deviceTypeRefs": [
+ 14
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 771
+ ],
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
@@ -7525,18 +7577,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 771
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 6e71a2c..ee7762e 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 50,
+ "code": 116,
+ "profileId": 259,
+ "label": "MA-robotic-vacuum-cleaner",
+ "name": "MA-robotic-vacuum-cleaner"
+ },
+ "deviceTypes": [
+ {
+ "id": 50,
+ "code": 116,
+ "profileId": 259,
+ "label": "MA-robotic-vacuum-cleaner",
+ "name": "MA-robotic-vacuum-cleaner"
+ }
+ ],
+ "deviceTypeRefs": [
+ 50
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 116
+ ],
"deviceTypeName": "MA-robotic-vacuum-cleaner",
"deviceTypeCode": 116,
"deviceTypeProfileId": 259,
@@ -9339,7 +9391,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -10277,7 +10329,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -10830,18 +10882,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 116
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
index e050bc9..a912923 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
@@ -10117,7 +10117,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -11055,7 +11055,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 8b4cbf9..227be12 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 40,
+ "code": 34,
+ "profileId": 259,
+ "label": "MA-speaker",
+ "name": "MA-speaker"
+ },
+ "deviceTypes": [
+ {
+ "id": 40,
+ "code": 34,
+ "profileId": 259,
+ "label": "MA-speaker",
+ "name": "MA-speaker"
+ }
+ ],
+ "deviceTypeRefs": [
+ 40
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 34
+ ],
"deviceTypeName": "MA-speaker",
"deviceTypeCode": 34,
"deviceTypeProfileId": 259,
@@ -6586,18 +6638,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 34
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 5f512e7..5e2dec0 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 24,
+ "code": 770,
+ "profileId": 259,
+ "label": "MA-tempsensor",
+ "name": "MA-tempsensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 24,
+ "code": 770,
+ "profileId": 259,
+ "label": "MA-tempsensor",
+ "name": "MA-tempsensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 24
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 770
+ ],
"deviceTypeName": "MA-tempsensor",
"deviceTypeCode": 770,
"deviceTypeProfileId": 259,
@@ -6354,18 +6406,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 770
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index 6e6f841..c296ec4 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5442,7 +5468,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 34,
+ "code": 769,
+ "profileId": 259,
+ "label": "MA-thermostat",
+ "name": "MA-thermostat"
+ },
+ "deviceTypes": [
+ {
+ "id": 34,
+ "code": 769,
+ "profileId": 259,
+ "label": "MA-thermostat",
+ "name": "MA-thermostat"
+ }
+ ],
+ "deviceTypeRefs": [
+ 34
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 769
+ ],
"deviceTypeName": "MA-thermostat",
"deviceTypeCode": 769,
"deviceTypeProfileId": 259,
@@ -7834,18 +7886,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 769
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 56e76d3..b20b648 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 31,
+ "code": 514,
+ "profileId": 259,
+ "label": "MA-windowcovering",
+ "name": "MA-windowcovering"
+ },
+ "deviceTypes": [
+ {
+ "id": 31,
+ "code": 514,
+ "profileId": 259,
+ "label": "MA-windowcovering",
+ "name": "MA-windowcovering"
+ }
+ ],
+ "deviceTypeRefs": [
+ 31
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 514
+ ],
"deviceTypeName": "MA-windowcovering",
"deviceTypeCode": 514,
"deviceTypeProfileId": 259,
@@ -7036,18 +7088,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 514
+ "networkId": 0
}
],
"log": []
diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap
index f74e712..daa049b 100644
--- a/examples/chef/devices/template.zap
+++ b/examples/chef/devices/template.zap
@@ -8623,7 +8623,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -9561,7 +9561,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
index c72c564..fe32b0c 100644
--- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap
+++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 90,
+ "featureLevel": 97,
"creator": "zap",
"keyValuePairs": [
{
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -239,7 +265,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -433,7 +459,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -1971,7 +1997,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "HourFormat",
+ "type": "HourFormatEnum",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
@@ -1987,7 +2013,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "CalendarType",
+ "type": "CalendarTypeEnum",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
@@ -2069,7 +2095,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "TempUnit",
+ "type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
@@ -2237,7 +2263,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "RegulatoryLocationType",
+ "type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2253,7 +2279,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
- "type": "RegulatoryLocationType",
+ "type": "RegulatoryLocationTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2493,7 +2519,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "NetworkCommissioningStatus",
+ "type": "NetworkCommissioningStatusEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -3034,7 +3060,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "RoutingRole",
+ "type": "RoutingRoleEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4120,7 +4146,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "SecurityType",
+ "type": "SecurityTypeEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4136,7 +4162,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "WiFiVersionType",
+ "type": "WiFiVersionEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5343,7 +5369,33 @@
]
},
{
+ "id": 2,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 9
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 257
+ ],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
@@ -5421,7 +5473,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "IdentifyTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5589,7 +5641,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5807,7 +5859,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -7178,7 +7230,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7588,7 +7640,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7635,7 +7687,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -7651,7 +7703,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -7667,7 +7719,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -7721,18 +7773,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 257
+ "networkId": 0
}
],
"log": []
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 cbc839b..e4ef514 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
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5385,7 +5411,33 @@
]
},
{
+ "id": 2,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 21,
+ "code": 21,
+ "profileId": 259,
+ "label": "MA-contactsensor",
+ "name": "MA-contactsensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 21,
+ "code": 21,
+ "profileId": 259,
+ "label": "MA-contactsensor",
+ "name": "MA-contactsensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 21
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 21
+ ],
"deviceTypeName": "MA-contactsensor",
"deviceTypeCode": 21,
"deviceTypeProfileId": 259,
@@ -7717,7 +7769,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8639,7 +8691,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8772,18 +8824,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 21
+ "networkId": 0
}
],
"log": []
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
index 765e9fd..de954c4 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 13,
+ "id": 2,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -6252,7 +6252,7 @@
]
},
{
- "id": 14,
+ "id": 1,
"name": "MA-dishwasher",
"deviceTypeRef": {
"id": 47,
@@ -9779,7 +9779,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -10701,7 +10701,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -10845,4 +10845,4 @@
}
],
"log": []
-}
+}
\ No newline at end of file
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 3f659df..5e83229 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
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 10,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -5902,7 +5902,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "500",
@@ -5918,7 +5918,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "300",
@@ -5934,7 +5934,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "300",
@@ -5950,7 +5950,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5966,7 +5966,7 @@
"side": "server",
"type": "int32u",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5982,7 +5982,7 @@
"side": "server",
"type": "int16u",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -5998,7 +5998,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6014,7 +6014,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6030,7 +6030,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6046,7 +6046,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6092,7 +6092,7 @@
]
},
{
- "id": 8,
+ "id": 3,
"name": "MA-onofflightswitch",
"deviceTypeRef": {
"id": 15,
@@ -8261,7 +8261,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8655,7 +8655,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8766,7 +8766,7 @@
]
},
{
- "id": 9,
+ "id": 2,
"name": "MA-genericswitch",
"deviceTypeRef": {
"id": 20,
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index ec1312d..12506ac 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -2235,7 +2235,7 @@
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster OccupancySensing {
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 f70ddb2..779988b 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5438,7 +5464,33 @@
]
},
{
+ "id": 2,
"name": "MA-extendedcolorlight",
+ "deviceTypeRef": {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ },
+ "deviceTypes": [
+ {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 11
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 269
+ ],
"deviceTypeName": "MA-extendedcolorlight",
"deviceTypeCode": 269,
"deviceTypeProfileId": 259,
@@ -7273,7 +7325,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8195,7 +8247,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8328,18 +8380,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-extendedcolorlight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 269
+ "networkId": 0
}
],
"log": []
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
index a50b846..9408959 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -2097,7 +2097,7 @@
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster OccupancySensing {
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 181fd61..e5524a5 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5438,7 +5464,33 @@
]
},
{
+ "id": 1,
"name": "MA-extendedcolorlight",
+ "deviceTypeRef": {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ },
+ "deviceTypes": [
+ {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 11
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 269
+ ],
"deviceTypeName": "MA-extendedcolorlight",
"deviceTypeCode": 269,
"deviceTypeProfileId": 259,
@@ -7273,7 +7325,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8195,7 +8247,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8328,18 +8380,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-extendedcolorlight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 269
+ "networkId": 0
}
],
"log": []
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 4040f58..d1a969a 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -2507,7 +2507,7 @@
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster OccupancySensing {
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index b972b17..cbac430 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -4727,7 +4753,33 @@
]
},
{
+ "id": 1,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 9
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 257
+ ],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
@@ -6690,7 +6742,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7612,7 +7664,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7745,18 +7797,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 257
+ "networkId": 0
}
],
"log": []
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index 80af441..520039f 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5486,7 +5512,33 @@
]
},
{
+ "id": 1,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 8,
+ "code": 256,
+ "profileId": 259,
+ "label": "MA-onofflight",
+ "name": "MA-onofflight"
+ },
+ "deviceTypes": [
+ {
+ "id": 8,
+ "code": 256,
+ "profileId": 259,
+ "label": "MA-onofflight",
+ "name": "MA-onofflight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 8
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 256
+ ],
"deviceTypeName": "MA-onofflight",
"deviceTypeCode": 256,
"deviceTypeProfileId": 259,
@@ -7837,7 +7889,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8759,7 +8811,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -9100,18 +9152,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 256
+ "networkId": 0
}
],
"log": []
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index b68a836..9dabc35 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -2142,7 +2142,7 @@
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
}
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index d1924fe..5792660 100644
--- a/examples/lighting-app/qpg/zap/light.zap
+++ b/examples/lighting-app/qpg/zap/light.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -6390,7 +6416,33 @@
]
},
{
+ "id": 2,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ },
+ "deviceTypes": [
+ {
+ "id": 11,
+ "code": 269,
+ "profileId": 259,
+ "label": "MA-extendedcolorlight",
+ "name": "MA-extendedcolorlight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 11
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 269
+ ],
"deviceTypeName": "MA-extendedcolorlight",
"deviceTypeCode": 269,
"deviceTypeProfileId": 259,
@@ -9197,7 +9249,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -10135,7 +10187,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -10268,18 +10320,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 269
+ "networkId": 0
}
],
"log": []
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
index 7c7495d..998877c 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -2560,7 +2560,7 @@
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
}
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 e0fc6f3..474821f 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 5,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -5790,7 +5790,7 @@
]
},
{
- "id": 6,
+ "id": 2,
"name": "MA-dimmablelight",
"deviceTypeRef": {
"id": 9,
@@ -8494,7 +8494,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -9416,7 +9416,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
index 7cc48b8..7b0211c 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -2400,7 +2400,7 @@
ram attribute coupleColorTempToLevelMinMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
}
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 1fde73b..1c71379 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 9,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -5536,7 +5536,7 @@
]
},
{
- "id": 10,
+ "id": 2,
"name": "MA-dimmablelight",
"deviceTypeRef": {
"id": 9,
@@ -8579,7 +8579,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -9501,7 +9501,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index e23670a..5bf8b66 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 26,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
@@ -759,7 +759,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -775,7 +775,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -791,7 +791,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -807,7 +807,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -823,7 +823,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1003,7 +1003,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1019,7 +1019,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1035,7 +1035,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1487,7 +1487,7 @@
"side": "server",
"type": "ProductAppearanceStruct",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1503,7 +1503,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1519,7 +1519,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1535,7 +1535,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1551,7 +1551,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2015,7 +2015,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2031,7 +2031,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2047,7 +2047,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2063,7 +2063,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2211,7 +2211,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2227,7 +2227,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2243,7 +2243,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2259,7 +2259,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2375,7 +2375,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2391,7 +2391,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2407,7 +2407,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2423,7 +2423,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2749,7 +2749,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2877,7 +2877,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3069,7 +3069,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3101,7 +3101,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3117,7 +3117,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3133,7 +3133,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3149,7 +3149,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3390,7 +3390,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3406,7 +3406,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3422,7 +3422,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3438,7 +3438,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3742,7 +3742,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3758,7 +3758,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3774,7 +3774,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3790,7 +3790,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4106,7 +4106,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4122,7 +4122,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4138,7 +4138,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4154,7 +4154,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6117,7 +6117,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6133,7 +6133,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6149,7 +6149,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6165,7 +6165,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6461,7 +6461,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6477,7 +6477,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6493,7 +6493,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6509,7 +6509,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6725,7 +6725,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6741,7 +6741,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6757,7 +6757,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7305,7 +7305,7 @@
]
},
{
- "id": 27,
+ "id": 2,
"name": "MA-doorlock",
"deviceTypeRef": {
"id": 29,
@@ -7453,7 +7453,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7469,7 +7469,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7485,7 +7485,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7501,7 +7501,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -8331,7 +8331,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -8347,7 +8347,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -8363,7 +8363,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -8379,7 +8379,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -8395,7 +8395,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9027,7 +9027,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9155,7 +9155,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9347,7 +9347,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9379,7 +9379,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9395,7 +9395,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9411,7 +9411,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9427,7 +9427,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10339,7 +10339,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index e570fee..89b5656 100644
--- a/examples/lock-app/nxp/zap/lock-app.zap
+++ b/examples/lock-app/nxp/zap/lock-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5486,7 +5512,33 @@
]
},
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 29,
+ "code": 10,
+ "profileId": 259,
+ "label": "MA-doorlock",
+ "name": "MA-doorlock"
+ },
+ "deviceTypes": [
+ {
+ "id": 29,
+ "code": 10,
+ "profileId": 259,
+ "label": "MA-doorlock",
+ "name": "MA-doorlock"
+ }
+ ],
+ "deviceTypeRefs": [
+ 29
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 10
+ ],
"deviceTypeName": "MA-doorlock",
"deviceTypeCode": 10,
"deviceTypeProfileId": 259,
@@ -6707,18 +6759,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 10
+ "networkId": 0
}
],
"log": []
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index b51392c..d0ce7a0 100644
--- a/examples/lock-app/qpg/zap/lock.zap
+++ b/examples/lock-app/qpg/zap/lock.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -6345,7 +6371,33 @@
]
},
{
+ "id": 2,
"name": "MA-doorlock",
+ "deviceTypeRef": {
+ "id": 29,
+ "code": 10,
+ "profileId": 259,
+ "label": "MA-doorlock",
+ "name": "MA-doorlock"
+ },
+ "deviceTypes": [
+ {
+ "id": 29,
+ "code": 10,
+ "profileId": 259,
+ "label": "MA-doorlock",
+ "name": "MA-doorlock"
+ }
+ ],
+ "deviceTypeRefs": [
+ 29
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 10
+ ],
"deviceTypeName": "MA-doorlock",
"deviceTypeCode": 10,
"deviceTypeProfileId": 259,
@@ -9386,18 +9438,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-doorlock",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 10
+ "networkId": 0
}
],
"log": []
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 471aecc..78e05e3 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
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 52,
+ "code": 0,
+ "profileId": 259,
+ "label": "MA-all-clusters-app",
+ "name": "MA-all-clusters-app"
+ },
+ "deviceTypes": [
+ {
+ "id": 52,
+ "code": 0,
+ "profileId": 259,
+ "label": "MA-all-clusters-app",
+ "name": "MA-all-clusters-app"
+ }
+ ],
+ "deviceTypeRefs": [
+ 52
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 0
+ ],
"deviceTypeName": "MA-all-clusters-app",
"deviceTypeCode": 0,
"deviceTypeProfileId": 259,
@@ -2580,7 +2606,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3406,7 +3432,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3523,9 +3549,7 @@
"endpointTypeIndex": 0,
"profileId": 598,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": null
+ "networkId": 0
}
],
"log": []
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 ecce96b..55f04a9 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
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -4044,7 +4070,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -4870,7 +4896,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -4987,9 +5013,7 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
}
],
"log": []
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 5a2b1f8..339541a 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
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -4121,7 +4147,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -4947,7 +4973,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -5058,7 +5084,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 15,
+ "code": 259,
+ "profileId": 259,
+ "label": "MA-onofflightswitch",
+ "name": "MA-onofflightswitch"
+ },
+ "deviceTypes": [
+ {
+ "id": 15,
+ "code": 259,
+ "profileId": 259,
+ "label": "MA-onofflightswitch",
+ "name": "MA-onofflightswitch"
+ }
+ ],
+ "deviceTypeRefs": [
+ 15
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 259
+ ],
"deviceTypeName": "MA-onofflightswitch",
"deviceTypeCode": 259,
"deviceTypeProfileId": 259,
@@ -6900,7 +6952,33 @@
]
},
{
+ "id": 3,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 53,
+ "code": 61442,
+ "profileId": 259,
+ "label": "MA-secondary-network-commissioning",
+ "name": "MA-secondary-network-commissioning"
+ },
+ "deviceTypes": [
+ {
+ "id": 53,
+ "code": 61442,
+ "profileId": 259,
+ "label": "MA-secondary-network-commissioning",
+ "name": "MA-secondary-network-commissioning"
+ }
+ ],
+ "deviceTypeRefs": [
+ 53
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 61442
+ ],
"deviceTypeName": "MA-secondary-network-commissioning",
"deviceTypeCode": 61442,
"deviceTypeProfileId": 259,
@@ -7446,27 +7524,21 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 259
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 65534,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 61442
+ "networkId": 0
}
],
"log": []
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 669139b..23eb1f6 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -7429,7 +7429,7 @@
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster OccupancySensing {
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index a32f708..8fc11af 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 28,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
@@ -195,7 +195,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -211,7 +211,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -227,7 +227,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -243,7 +243,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -259,7 +259,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1087,7 +1087,7 @@
"side": "server",
"type": "ProductAppearanceStruct",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1103,7 +1103,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1119,7 +1119,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1135,7 +1135,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1151,7 +1151,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1290,7 +1290,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1306,7 +1306,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1322,7 +1322,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1338,7 +1338,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1354,7 +1354,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1502,7 +1502,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1518,7 +1518,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1534,7 +1534,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1550,7 +1550,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1666,7 +1666,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1682,7 +1682,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1698,7 +1698,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1714,7 +1714,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2392,7 +2392,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2408,7 +2408,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2424,7 +2424,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2440,7 +2440,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2704,7 +2704,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3024,7 +3024,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3040,7 +3040,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3056,7 +3056,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3336,7 +3336,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3352,7 +3352,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3368,7 +3368,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3384,7 +3384,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5837,7 +5837,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5853,7 +5853,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5869,7 +5869,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5885,7 +5885,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6085,7 +6085,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6181,7 +6181,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6197,7 +6197,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6213,7 +6213,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6229,7 +6229,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6381,7 +6381,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6397,7 +6397,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6413,7 +6413,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6429,7 +6429,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6445,7 +6445,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6461,7 +6461,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6477,7 +6477,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6493,7 +6493,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -12099,7 +12099,7 @@
]
},
{
- "id": 29,
+ "id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 9,
@@ -14768,7 +14768,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -15642,7 +15642,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 6a953a3..c7bce14 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -7372,7 +7372,7 @@
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
server cluster OccupancySensing {
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index bfeaee1..931ee37 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 30,
+ "id": 2,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 3,
@@ -195,7 +195,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -211,7 +211,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -227,7 +227,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -243,7 +243,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -259,7 +259,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1087,7 +1087,7 @@
"side": "server",
"type": "ProductAppearanceStruct",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1103,7 +1103,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1119,7 +1119,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1135,7 +1135,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1151,7 +1151,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1306,7 +1306,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1322,7 +1322,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1338,7 +1338,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1354,7 +1354,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1502,7 +1502,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1518,7 +1518,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1534,7 +1534,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1550,7 +1550,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1666,7 +1666,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1682,7 +1682,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1698,7 +1698,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1714,7 +1714,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2392,7 +2392,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2408,7 +2408,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2424,7 +2424,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2440,7 +2440,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2704,7 +2704,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3024,7 +3024,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3040,7 +3040,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3056,7 +3056,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3336,7 +3336,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3352,7 +3352,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3368,7 +3368,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3384,7 +3384,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5837,7 +5837,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5853,7 +5853,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5869,7 +5869,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5885,7 +5885,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6085,7 +6085,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6181,7 +6181,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6197,7 +6197,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6213,7 +6213,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6229,7 +6229,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6381,7 +6381,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6397,7 +6397,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6413,7 +6413,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6429,7 +6429,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6445,7 +6445,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6461,7 +6461,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6477,7 +6477,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6493,7 +6493,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -12183,7 +12183,7 @@
]
},
{
- "id": 31,
+ "id": 1,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 9,
@@ -14568,7 +14568,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -15442,7 +15442,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 40391d5..af27826 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-pump",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5670,7 +5696,33 @@
]
},
{
+ "id": 2,
"name": "MA-pump",
+ "deviceTypeRef": {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ },
+ "deviceTypes": [
+ {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ }
+ ],
+ "deviceTypeRefs": [
+ 14
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 771
+ ],
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
@@ -7972,18 +8024,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-pump",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 771
+ "networkId": 0
}
],
"log": []
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 3adcc3f..8b8fc82 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-pump",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5670,7 +5696,33 @@
]
},
{
+ "id": 2,
"name": "MA-pump",
+ "deviceTypeRef": {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ },
+ "deviceTypes": [
+ {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ }
+ ],
+ "deviceTypeRefs": [
+ 14
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 771
+ ],
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
@@ -7972,18 +8024,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-pump",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 771
+ "networkId": 0
}
],
"log": []
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 3adcc3f..ad985a8 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-pump",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5670,7 +5696,33 @@
]
},
{
+ "id": 1,
"name": "MA-pump",
+ "deviceTypeRef": {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ },
+ "deviceTypes": [
+ {
+ "id": 14,
+ "code": 771,
+ "profileId": 2457,
+ "label": "MA-pump",
+ "name": "MA-pump"
+ }
+ ],
+ "deviceTypeRefs": [
+ 14
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 771
+ ],
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
@@ -7972,18 +8024,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-pump",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 771
+ "networkId": 0
}
],
"log": []
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 6523e9f..4ddbc45 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
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5618,7 +5644,33 @@
]
},
{
+ "id": 2,
"name": "MA-pumpcontroller",
+ "deviceTypeRef": {
+ "id": 19,
+ "code": 772,
+ "profileId": 2457,
+ "label": "MA-pumpcontroller",
+ "name": "MA-pumpcontroller"
+ },
+ "deviceTypes": [
+ {
+ "id": 19,
+ "code": 772,
+ "profileId": 2457,
+ "label": "MA-pumpcontroller",
+ "name": "MA-pumpcontroller"
+ }
+ ],
+ "deviceTypeRefs": [
+ 19
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 772
+ ],
"deviceTypeName": "MA-pumpcontroller",
"deviceTypeCode": 772,
"deviceTypeProfileId": 2457,
@@ -6800,18 +6852,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-pumpcontroller",
"endpointTypeIndex": 1,
"profileId": 2457,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 772
+ "networkId": 0
}
],
"log": []
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
index edf84a1..4f612e4 100644
--- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
+++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5438,7 +5464,33 @@
]
},
{
+ "id": 2,
"name": "Anonymous Endpoint Type",
+ "deviceTypeRef": {
+ "id": 35,
+ "code": 43,
+ "profileId": 259,
+ "label": "MA-fan",
+ "name": "MA-fan"
+ },
+ "deviceTypes": [
+ {
+ "id": 35,
+ "code": 43,
+ "profileId": 259,
+ "label": "MA-fan",
+ "name": "MA-fan"
+ }
+ ],
+ "deviceTypeRefs": [
+ 35
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 43
+ ],
"deviceTypeName": "MA-fan",
"deviceTypeCode": 43,
"deviceTypeProfileId": 259,
@@ -6942,18 +6994,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 43
+ "networkId": 0
}
],
"log": []
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 64d349d..f3c9f6c 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
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 37,
+ "id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
@@ -5571,7 +5571,7 @@
]
},
{
- "id": 36,
+ "id": 2,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 3,
@@ -6115,7 +6115,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6131,7 +6131,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6147,7 +6147,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6163,7 +6163,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6179,7 +6179,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6195,7 +6195,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6211,7 +6211,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6227,7 +6227,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6243,7 +6243,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
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 d854c4a..1f50f07 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -3314,10 +3340,36 @@
]
},
{
+ "id": 2,
"name": "MA-tempsensor",
- "deviceTypeName": null,
- "deviceTypeCode": null,
- "deviceTypeProfileId": null,
+ "deviceTypeRef": {
+ "id": 24,
+ "code": 770,
+ "profileId": 259,
+ "label": "MA-tempsensor",
+ "name": "MA-tempsensor"
+ },
+ "deviceTypes": [
+ {
+ "id": 24,
+ "code": 770,
+ "profileId": 259,
+ "label": "MA-tempsensor",
+ "name": "MA-tempsensor"
+ }
+ ],
+ "deviceTypeRefs": [
+ 24
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 770
+ ],
+ "deviceTypeName": "MA-tempsensor",
+ "deviceTypeCode": 770,
+ "deviceTypeProfileId": 259,
"clusters": [
{
"name": "Identify",
@@ -4194,18 +4246,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-tempsensor",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 770
+ "networkId": 0
}
],
"log": []
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 1e524bf..b15be33 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -6194,7 +6194,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7020,7 +7020,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -11998,7 +11998,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -12824,7 +12824,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 3474a5f..d2488a3 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 3,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5934,7 +5960,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6760,7 +6786,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7411,7 +7437,33 @@
]
},
{
+ "id": 4,
"name": "MA-videoplayer",
+ "deviceTypeRef": {
+ "id": 36,
+ "code": 35,
+ "profileId": 259,
+ "label": "MA-casting-videoplayer",
+ "name": "MA-casting-videoplayer"
+ },
+ "deviceTypes": [
+ {
+ "id": 36,
+ "code": 35,
+ "profileId": 259,
+ "label": "MA-casting-videoplayer",
+ "name": "MA-casting-videoplayer"
+ }
+ ],
+ "deviceTypeRefs": [
+ 36
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 35
+ ],
"deviceTypeName": "MA-casting-videoplayer",
"deviceTypeCode": 35,
"deviceTypeProfileId": 259,
@@ -9741,7 +9793,33 @@
]
},
{
+ "id": 1,
"name": "MA-speaker",
+ "deviceTypeRef": {
+ "id": 40,
+ "code": 34,
+ "profileId": 259,
+ "label": "MA-speaker",
+ "name": "MA-speaker"
+ },
+ "deviceTypes": [
+ {
+ "id": 40,
+ "code": 34,
+ "profileId": 259,
+ "label": "MA-speaker",
+ "name": "MA-speaker"
+ }
+ ],
+ "deviceTypeRefs": [
+ 40
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 34
+ ],
"deviceTypeName": "MA-speaker",
"deviceTypeCode": 34,
"deviceTypeProfileId": 259,
@@ -10515,7 +10593,33 @@
]
},
{
+ "id": 2,
"name": "MA-contentapplication",
+ "deviceTypeRef": {
+ "id": 41,
+ "code": 36,
+ "profileId": 259,
+ "label": "MA-contentapp",
+ "name": "MA-contentapp"
+ },
+ "deviceTypes": [
+ {
+ "id": 41,
+ "code": 36,
+ "profileId": 259,
+ "label": "MA-contentapp",
+ "name": "MA-contentapp"
+ }
+ ],
+ "deviceTypeRefs": [
+ 41
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 36
+ ],
"deviceTypeName": "MA-contentapp",
"deviceTypeCode": 36,
"deviceTypeProfileId": 259,
@@ -12429,36 +12533,28 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-videoplayer",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 35
+ "networkId": 0
},
{
"endpointTypeName": "MA-speaker",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 2,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 34
+ "networkId": 0
},
{
"endpointTypeName": "MA-contentapplication",
"endpointTypeIndex": 3,
"profileId": 259,
"endpointId": 3,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 36
+ "networkId": 0
}
],
"log": []
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 8d2b798..6255dcf 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
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5991,7 +6017,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6817,7 +6843,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7060,7 +7086,33 @@
]
},
{
+ "id": 2,
"name": "MA-videoplayer",
+ "deviceTypeRef": {
+ "id": 38,
+ "code": 41,
+ "profileId": 259,
+ "label": "MA-casting-videoclient",
+ "name": "MA-casting-videoclient"
+ },
+ "deviceTypes": [
+ {
+ "id": 38,
+ "code": 41,
+ "profileId": 259,
+ "label": "MA-casting-videoclient",
+ "name": "MA-casting-videoclient"
+ }
+ ],
+ "deviceTypeRefs": [
+ 38
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 41
+ ],
"deviceTypeName": "MA-casting-videoclient",
"deviceTypeCode": 41,
"deviceTypeProfileId": 259,
@@ -11535,7 +11587,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -12361,7 +12413,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -15416,18 +15468,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-videoplayer",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 41
+ "networkId": 0
}
],
"log": []
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
index 2cd6171..b1bb51e 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -2927,7 +2927,7 @@
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 1;
- ram attribute clusterRevision default = 5;
+ ram attribute clusterRevision default = 6;
}
}
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 71642a7..7bd3d94 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
@@ -5960,7 +5960,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6786,7 +6786,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -12230,7 +12230,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -13168,7 +13168,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 76df605..628aaed 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -33,7 +33,7 @@
],
"endpointTypes": [
{
- "id": 3,
+ "id": 2,
"name": "MA-windowcovering",
"deviceTypeRef": {
"id": 3,
@@ -6989,7 +6989,7 @@
]
},
{
- "id": 4,
+ "id": 1,
"name": "MA-windowcovering",
"deviceTypeRef": {
"id": 31,
@@ -8551,7 +8551,7 @@
]
},
{
- "id": 5,
+ "id": 3,
"name": "MA-windowcovering",
"deviceTypeRef": {
"id": 31,
diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index d2c9b0c..65fb24b 100644
--- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap
+++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -18,25 +18,25 @@
"package": [
{
"pathRelativity": "relativeToZap",
- "path": "../../../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "version": "chip-v1"
- },
- {
- "pathRelativity": "relativeToZap",
"path": "../../../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data with some extensions"
+ },
+ {
+ "pathRelativity": "relativeToZap",
+ "path": "../../../../../src/app/zap-templates/app-templates.json",
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
{
- "id": 48,
+ "id": 2,
"name": "MA-rootdevice",
"deviceTypeRef": {
- "id": 56,
+ "id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
@@ -44,14 +44,14 @@
},
"deviceTypes": [
{
- "id": 56,
+ "id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
},
{
- "id": 55,
+ "id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
@@ -59,8 +59,8 @@
}
],
"deviceTypeRefs": [
- 56,
- 55
+ 3,
+ 2
],
"deviceVersions": [
1,
@@ -949,7 +949,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -965,7 +965,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -981,7 +981,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -997,7 +997,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1013,7 +1013,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1277,7 +1277,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1293,7 +1293,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1309,7 +1309,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1325,7 +1325,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1761,7 +1761,7 @@
"side": "server",
"type": "ProductAppearanceStruct",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1777,7 +1777,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1793,7 +1793,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1809,7 +1809,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1825,7 +1825,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2289,7 +2289,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2305,7 +2305,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2321,7 +2321,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2337,7 +2337,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2517,7 +2517,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2649,7 +2649,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2665,7 +2665,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2681,7 +2681,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2697,7 +2697,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3407,7 +3407,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3655,7 +3655,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3671,7 +3671,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3687,7 +3687,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3703,7 +3703,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4007,7 +4007,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4023,7 +4023,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4039,7 +4039,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4403,7 +4403,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6473,7 +6473,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6489,7 +6489,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6505,7 +6505,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6521,7 +6521,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6817,7 +6817,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6833,7 +6833,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6849,7 +6849,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6865,7 +6865,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7081,7 +7081,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7097,7 +7097,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7113,7 +7113,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7129,7 +7129,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -7928,7 +7928,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8754,7 +8754,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -9787,10 +9787,10 @@
]
},
{
- "id": 47,
+ "id": 3,
"name": "MA-onofflight",
"deviceTypeRef": {
- "id": 61,
+ "id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
@@ -9798,14 +9798,14 @@
},
"deviceTypes": [
{
- "id": 61,
+ "id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
- "id": 56,
+ "id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
@@ -9813,8 +9813,8 @@
}
],
"deviceTypeRefs": [
- 61,
- 56
+ 8,
+ 3
],
"deviceVersions": [
1,
@@ -9935,7 +9935,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9951,7 +9951,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9967,7 +9967,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -9983,7 +9983,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10183,7 +10183,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10199,7 +10199,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10215,7 +10215,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10231,7 +10231,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10551,7 +10551,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10567,7 +10567,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10583,7 +10583,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10599,7 +10599,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10615,7 +10615,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -10877,7 +10877,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11679,7 +11679,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11695,7 +11695,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11711,7 +11711,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11727,7 +11727,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11743,7 +11743,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -13139,7 +13139,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -17319,7 +17319,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -18193,7 +18193,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -22512,10 +22512,10 @@
]
},
{
- "id": 46,
+ "id": 1,
"name": "MA-onofflight",
"deviceTypeRef": {
- "id": 61,
+ "id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
@@ -22523,14 +22523,14 @@
},
"deviceTypes": [
{
- "id": 61,
+ "id": 8,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
- "id": 56,
+ "id": 3,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
@@ -22538,8 +22538,8 @@
}
],
"deviceTypeRefs": [
- 61,
- 56
+ 8,
+ 3
],
"deviceVersions": [
1,
@@ -22660,7 +22660,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22676,7 +22676,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22692,7 +22692,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22708,7 +22708,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22908,7 +22908,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22924,7 +22924,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22940,7 +22940,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -22956,7 +22956,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23276,7 +23276,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23292,7 +23292,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23308,7 +23308,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23324,7 +23324,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23340,7 +23340,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23570,7 +23570,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23586,7 +23586,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23602,7 +23602,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23618,7 +23618,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23964,7 +23964,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23980,7 +23980,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -23996,7 +23996,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24012,7 +24012,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -24028,7 +24028,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -25044,7 +25044,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -25727,7 +25727,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -26553,7 +26553,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -26796,10 +26796,10 @@
]
},
{
- "id": 45,
+ "id": 4,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
- "id": 106,
+ "id": 53,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
@@ -26807,7 +26807,7 @@
},
"deviceTypes": [
{
- "id": 106,
+ "id": 53,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
@@ -26815,7 +26815,7 @@
}
],
"deviceTypeRefs": [
- 106
+ 53
],
"deviceVersions": [
1
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index 8f6ab7a..d3cbd58 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 2,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -5406,7 +5432,33 @@
]
},
{
+ "id": 1,
"name": "MA-dimmablelight",
+ "deviceTypeRef": {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ },
+ "deviceTypes": [
+ {
+ "id": 9,
+ "code": 257,
+ "profileId": 259,
+ "label": "MA-dimmablelight",
+ "name": "MA-dimmablelight"
+ }
+ ],
+ "deviceTypeRefs": [
+ 9
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 257
+ ],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
@@ -7241,7 +7293,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8163,7 +8215,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8296,18 +8348,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 257
+ "networkId": 0
}
],
"log": []
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
index b827ad0..4b23f95 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -1131,7 +1131,7 @@
ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \
ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpColorTemperatureMireds */ \
{ ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
index c3f5873..b9f2e8d 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -515,7 +515,7 @@
ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \
ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpColorTemperatureMireds */ \
{ ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index bc52b5f..ed41e04 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -33,7 +33,33 @@
],
"endpointTypes": [
{
+ "id": 1,
"name": "MA-rootdevice",
+ "deviceTypeRef": {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ },
+ "deviceTypes": [
+ {
+ "id": 2,
+ "code": 22,
+ "profileId": 259,
+ "label": "MA-rootdevice",
+ "name": "MA-rootdevice"
+ }
+ ],
+ "deviceTypeRefs": [
+ 2
+ ],
+ "deviceVersions": [
+ 1
+ ],
+ "deviceIdentifiers": [
+ 22
+ ],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
@@ -18109,7 +18135,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -19047,7 +19073,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "5",
+ "defaultValue": "6",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -28760,9 +28786,7 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 1,
- "networkId": 0,
- "endpointVersion": 1,
- "deviceIdentifier": 22
+ "networkId": 0
}
],
"log": []
