From 9f16e9aff83f449b49dab85d45bdd730ef7a6542 Mon Sep 17 00:00:00 2001
From: Leonard Zgrablic <32855262+lzgrablic02@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:43:34 -0500
Subject: [PATCH] Basic Information cluster attribute cleanup (#14489)
* Basic Information Cluster Attribute 0 changed
Attribute 0 (InteractionModelVersion) was changed to DataModelRevision
in the spec. This commit updates the code.
In the process, it was found that light-switch-app had been added with
old ZAP JSON for Basic Info cluster and so it was updated.
ZAP regen.
* Switch 2 Basic Info cluster attrs to NVM
NodeLabel and LocalConfigDisabled are nonvolatile, but where listed in
.zap files as RAM instead of NVM.
Also, noticed second instance of Basic Info cluster in light-switch-app
.zap that was outdated.
* Set DataModelRevision to 10 in .zap
Set Basic Info cluster DataModelRevision to 10 (revision for initial
release of spec).
* ZAP regen
* Change a couple more outdated symbols
BasicClientFragment.kt still had a couple outdated and typoed symbols.
* Add "DataModelRevision" to word list
---
.github/.wordlist.txt | 1 +
.../guides/python_chip_controller_building.md | 2 +-
.../all-clusters-app.matter | 2 +-
.../all-clusters-common/all-clusters-app.zap | 26 +-
.../bridge-common/bridge-app.matter | 2 +-
.../bridge-app/bridge-common/bridge-app.zap | 18 +-
.../door-lock-common/door-lock-app.matter | 2 +-
.../door-lock-common/door-lock-app.zap | 18 +-
.../light-switch-app.matter | 120 ++++-
.../light-switch-common/light-switch-app.zap | 204 +++++--
.../lighting-common/lighting-app.matter | 2 +-
.../lighting-common/lighting-app.zap | 26 +-
examples/lock-app/lock-common/lock-app.matter | 2 +-
examples/lock-app/lock-common/lock-app.zap | 18 +-
.../log-source-common/log-source-app.zap | 10 +-
.../ota-provider-common/ota-provider-app.zap | 10 +-
.../ota-requestor-app.matter | 2 +-
.../ota-requestor-app.zap | 10 +-
.../placeholder/linux/apps/app1/config.matter | 2 +-
.../placeholder/linux/apps/app1/config.zap | 18 +-
.../placeholder/linux/apps/app2/config.matter | 2 +-
.../placeholder/linux/apps/app2/config.zap | 18 +-
examples/pump-app/pump-common/pump-app.matter | 2 +-
examples/pump-app/pump-common/pump-app.zap | 18 +-
.../pump-controller-app.matter | 2 +-
.../pump-controller-app.zap | 18 +-
.../esp32/main/temperature-measurement.matter | 2 +-
.../esp32/main/temperature-measurement.zap | 18 +-
.../thermostat-common/thermostat.matter | 2 +-
.../thermostat-common/thermostat.zap | 18 +-
examples/tv-app/tv-common/tv-app.matter | 2 +-
examples/tv-app/tv-common/tv-app.zap | 10 +-
.../tv-casting-common/tv-casting-app.matter | 2 +-
.../tv-casting-common/tv-casting-app.zap | 26 +-
examples/window-app/common/window-app.matter | 2 +-
examples/window-app/common/window-app.zap | 26 +-
.../clusterclient/BasicClientFragment.kt | 16 +-
.../app/src/main/res/values/strings.xml | 2 +-
.../suites/certification/Test_TC_DM_1_1.yaml | 4 +-
.../Test_TC_DM_1_3_Simulated.yaml | 4 +-
.../chip/basic-information-cluster.xml | 2 +-
.../data_model/controller-clusters.matter | 2 +-
.../data_model/controller-clusters.zap | 8 +-
.../java/zap-generated/CHIPCallbackTypes.h | 4 +-
.../java/zap-generated/CHIPClusters-JNI.cpp | 6 +-
.../chip/devicecontroller/ChipClusters.java | 12 +-
.../devicecontroller/ClusterReadMapping.java | 12 +-
.../python/chip/clusters/CHIPClusters.py | 2 +-
.../python/chip/clusters/Objects.py | 6 +-
.../CHIPAttributeTLVValueDecoder.mm | 4 +-
.../CHIP/zap-generated/CHIPClustersObjc.h | 15 +-
.../CHIP/zap-generated/CHIPClustersObjc.mm | 19 +-
.../CHIP/zap-generated/CHIPTestClustersObjc.h | 3 +-
.../zap-generated/CHIPTestClustersObjc.mm | 5 +-
.../Framework/CHIPTests/CHIPClustersTests.m | 6 +-
.../zap-generated/endpoint_config.h | 9 +-
.../app-common/zap-generated/attribute-id.h | 2 +-
.../zap-generated/attributes/Accessors.cpp | 4 +-
.../zap-generated/attributes/Accessors.h | 4 +-
.../zap-generated/cluster-objects.cpp | 4 +-
.../zap-generated/cluster-objects.h | 8 +-
.../app-common/zap-generated/ids/Attributes.h | 4 +-
.../zap-generated/endpoint_config.h | 9 +-
.../zap-generated/cluster/Commands.h | 59 +-
.../cluster/logging/DataModelLogger.cpp | 4 +-
.../chip-tool/zap-generated/test/Commands.h | 16 +-
.../zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 505 +++++++++---------
.../zap-generated/endpoint_config.h | 9 +-
.../lock-app/zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 8 +-
.../app1/zap-generated/endpoint_config.h | 18 +-
.../app1/zap-generated/test/Commands.h | 11 +-
.../app2/zap-generated/endpoint_config.h | 18 +-
.../app2/zap-generated/test/Commands.h | 11 +-
.../pump-app/zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 18 +-
.../tv-app/zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 9 +-
.../zap-generated/endpoint_config.h | 9 +-
82 files changed, 921 insertions(+), 667 deletions(-)
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index 36036b8e4072db..dbfe7fee594cbe 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -261,6 +261,7 @@ CYW
DAC
DAP
DataFrame
+DataModelRevision
dataset
datasets
dbf
diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md
index d250afe174cde9..465dd964b9c0b6 100644
--- a/docs/guides/python_chip_controller_building.md
+++ b/docs/guides/python_chip_controller_building.md
@@ -505,7 +505,7 @@ List available commands in cluster. For example, for _Basic_ cluster:
```
chip-device-ctrl > zcl ? Basic
-InteractionModelVersion
+DataModelRevision
VendorName
VendorID
ProductName
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 93035df6d9d697..0398748aa3c1f3 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
@@ -205,7 +205,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
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 bc820cc4e0220a..30b91cdecbf400 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
@@ -1041,7 +1041,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -1049,7 +1049,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1121,7 +1121,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1286,7 +1286,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -8901,7 +8901,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8909,7 +8909,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8981,7 +8981,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -9146,7 +9146,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -18890,7 +18890,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -18898,7 +18898,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -18970,7 +18970,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -19135,7 +19135,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -21103,4 +21103,4 @@
"deviceIdentifier": 256
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index e03efe9003a07d..6b2f7e092cb94c 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 14ca13c4df0176..59e5fdaace75de 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -184,7 +184,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -192,7 +192,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -264,7 +264,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -429,7 +429,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -4474,7 +4474,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -4482,7 +4482,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -4554,7 +4554,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -4719,7 +4719,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -4977,4 +4977,4 @@
"deviceIdentifier": 257
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter
index 4eaf55c0247de6..0c4dd59a7f26aa 100644
--- a/examples/door-lock-app/door-lock-common/door-lock-app.matter
+++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.zap b/examples/door-lock-app/door-lock-common/door-lock-app.zap
index 3b563ebfc4d2f3..c32bb22435db77 100644
--- a/examples/door-lock-app/door-lock-common/door-lock-app.zap
+++ b/examples/door-lock-app/door-lock-common/door-lock-app.zap
@@ -978,7 +978,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -986,7 +986,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1058,7 +1058,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1223,7 +1223,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -5580,7 +5580,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5588,7 +5588,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -5660,7 +5660,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -5825,7 +5825,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -7083,4 +7083,4 @@
"deviceIdentifier": 10
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index b89d520d083b68..785d948a46b03a 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -96,7 +96,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
@@ -595,6 +595,35 @@ client cluster Groups = 4 {
readonly attribute bitmap8 nameSupport = 0;
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute int16u clusterRevision = 65533;
+
+ request struct AddGroupRequest {
+ INT16U groupId = 0;
+ CHAR_STRING groupName = 1;
+ }
+
+ request struct AddGroupIfIdentifyingRequest {
+ INT16U groupId = 0;
+ CHAR_STRING groupName = 1;
+ }
+
+ request struct GetGroupMembershipRequest {
+ INT16U groupList[] = 0;
+ }
+
+ request struct RemoveGroupRequest {
+ INT16U groupId = 0;
+ }
+
+ request struct ViewGroupRequest {
+ INT16U groupId = 0;
+ }
+
+ command AddGroup(AddGroupRequest): AddGroupResponse = 0;
+ command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+ command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+ command RemoveAllGroups(): DefaultSuccess = 4;
+ command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+ command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
}
client cluster Identify = 3 {
@@ -964,6 +993,10 @@ client cluster OnOff = 6 {
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
+
+ command Off(): DefaultSuccess = 0;
+ command On(): DefaultSuccess = 1;
+ command Toggle(): DefaultSuccess = 2;
}
server cluster OperationalCredentials = 62 {
@@ -1093,6 +1126,91 @@ client cluster Scenes = 5 {
readonly attribute bitmap8 nameSupport = 4;
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute int16u clusterRevision = 65533;
+
+ request struct AddSceneRequest {
+ INT16U groupId = 0;
+ INT8U sceneId = 1;
+ INT16U transitionTime = 2;
+ CHAR_STRING sceneName = 3;
+ SceneExtensionFieldSet extensionFieldSets[] = 4;
+ }
+
+ request struct GetSceneMembershipRequest {
+ INT16U groupId = 0;
+ }
+
+ request struct RecallSceneRequest {
+ INT16U groupId = 0;
+ INT8U sceneId = 1;
+ INT16U transitionTime = 2;
+ }
+
+ request struct RemoveAllScenesRequest {
+ INT16U groupId = 0;
+ }
+
+ request struct RemoveSceneRequest {
+ INT16U groupId = 0;
+ INT8U sceneId = 1;
+ }
+
+ request struct StoreSceneRequest {
+ INT16U groupId = 0;
+ INT8U sceneId = 1;
+ }
+
+ request struct ViewSceneRequest {
+ INT16U groupId = 0;
+ INT8U sceneId = 1;
+ }
+
+ response struct AddSceneResponse {
+ ENUM8 status = 0;
+ INT16U groupId = 1;
+ INT8U sceneId = 2;
+ }
+
+ response struct GetSceneMembershipResponse {
+ ENUM8 status = 0;
+ INT8U capacity = 1;
+ INT16U groupId = 2;
+ INT8U sceneCount = 3;
+ INT8U sceneList[] = 4;
+ }
+
+ response struct RemoveAllScenesResponse {
+ ENUM8 status = 0;
+ INT16U groupId = 1;
+ }
+
+ response struct RemoveSceneResponse {
+ ENUM8 status = 0;
+ INT16U groupId = 1;
+ INT8U sceneId = 2;
+ }
+
+ response struct StoreSceneResponse {
+ ENUM8 status = 0;
+ INT16U groupId = 1;
+ INT8U sceneId = 2;
+ }
+
+ response struct ViewSceneResponse {
+ ENUM8 status = 0;
+ INT16U groupId = 1;
+ INT8U sceneId = 2;
+ INT16U transitionTime = 3;
+ CHAR_STRING sceneName = 4;
+ SceneExtensionFieldSet extensionFieldSets[] = 5;
+ }
+
+ command AddScene(AddSceneRequest): AddSceneResponse = 0;
+ command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+ command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+ command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+ command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+ command StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+ command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
}
server cluster SoftwareDiagnostics = 52 {
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 5609694b7bf267..020e8d9ab8d524 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
@@ -1126,7 +1126,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1144,7 +1144,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -1152,7 +1152,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1164,7 +1164,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1179,7 +1179,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1194,7 +1194,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1209,7 +1209,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1224,7 +1224,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1239,10 +1239,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "XX",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1254,10 +1254,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1269,7 +1269,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1284,10 +1284,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1299,7 +1299,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1314,10 +1314,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "20210614123456ZZ",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1329,7 +1329,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1344,7 +1344,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1359,7 +1359,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1374,7 +1374,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1389,7 +1389,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -1419,7 +1419,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1437,7 +1437,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6063,7 +6063,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6081,7 +6081,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6089,7 +6089,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6101,7 +6101,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -6116,7 +6116,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -6131,7 +6131,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -6146,7 +6146,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -6161,7 +6161,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -6176,10 +6176,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "XX",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6191,10 +6191,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6206,7 +6206,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -6221,10 +6221,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
- "defaultValue": "0x00",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6236,9 +6236,129 @@
"mfgCode": null,
"side": "server",
"included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "ManufacturingDate",
+ "code": 11,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "20210614123456ZZ",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "PartNumber",
+ "code": 12,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "ProductURL",
+ "code": 13,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "ProductLabel",
+ "code": 14,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "SerialNumber",
+ "code": 15,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "LocalConfigDisabled",
+ "code": 16,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "NVM",
+ "singleton": 1,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "Reachable",
+ "code": 17,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "UniqueID",
+ "code": 18,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 1,
+ "bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 0,
@@ -6254,7 +6374,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "3",
+ "defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -6973,4 +7093,4 @@
"deviceIdentifier": 259
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 15051e1163882e..ce3e592eeeac09 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index 90d7d83c691fcb..b85a8d84053818 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -965,7 +965,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -973,7 +973,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1045,7 +1045,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1210,7 +1210,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -5725,7 +5725,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5733,7 +5733,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -5805,7 +5805,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -5970,7 +5970,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -7054,7 +7054,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7062,7 +7062,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7134,7 +7134,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -7299,7 +7299,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -7387,4 +7387,4 @@
"deviceIdentifier": 259
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 27600f686ca244..7b3a8b03d63eef 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index fb414ef8bdbabf..274f0965086b99 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -978,7 +978,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -986,7 +986,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1058,7 +1058,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1223,7 +1223,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -5580,7 +5580,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5588,7 +5588,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -5660,7 +5660,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -5825,7 +5825,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -6172,4 +6172,4 @@
"deviceIdentifier": 10
}
]
-}
\ No newline at end of file
+}
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 207100a0b7c71c..ef0fdd108814f1 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
@@ -771,7 +771,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -779,7 +779,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -851,7 +851,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1016,7 +1016,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -3520,4 +3520,4 @@
"deviceIdentifier": null
}
]
-}
\ No newline at end of file
+}
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 4044d3f1f1419a..9df471778319d9 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
@@ -771,7 +771,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -779,7 +779,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -851,7 +851,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1016,7 +1016,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -4153,4 +4153,4 @@
"deviceIdentifier": 22
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index adeb0c51d0acf2..be3a69670a315c 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -21,7 +21,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
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 d8f7622cb6779d..1313fe938b8b90 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
@@ -771,7 +771,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -779,7 +779,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -851,7 +851,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1016,7 +1016,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -4252,4 +4252,4 @@
"deviceIdentifier": 22
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 2f76d45467b139..d23b439adec6fc 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -16,7 +16,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index c1a62fd85d7bb3..18e0e738231030 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -184,7 +184,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -192,7 +192,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -264,7 +264,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -429,7 +429,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -1996,7 +1996,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -2004,7 +2004,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -2076,7 +2076,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2241,7 +2241,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -2517,4 +2517,4 @@
"deviceIdentifier": 258
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 2f76d45467b139..d23b439adec6fc 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -16,7 +16,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index c1a62fd85d7bb3..18e0e738231030 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -184,7 +184,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -192,7 +192,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -264,7 +264,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -429,7 +429,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -1996,7 +1996,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -2004,7 +2004,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -2076,7 +2076,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2241,7 +2241,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -2517,4 +2517,4 @@
"deviceIdentifier": 258
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 1d3188139d7b59..2b4912f7c7ef82 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 7bb7bd655677d2..02c445935c2ea3 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -883,7 +883,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -891,7 +891,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -963,7 +963,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1128,7 +1128,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -5536,7 +5536,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5544,7 +5544,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -5616,7 +5616,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -5781,7 +5781,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -6653,4 +6653,4 @@
"deviceIdentifier": 771
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index bd83e1bb32bcaf..e11129553577da 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
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 d9c3368cafa000..36264b51e7d16c 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
@@ -883,7 +883,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -891,7 +891,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -963,7 +963,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1128,7 +1128,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -5536,7 +5536,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5544,7 +5544,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -5616,7 +5616,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -5781,7 +5781,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -6398,4 +6398,4 @@
"deviceIdentifier": 772
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
index aa1077643d2726..dc51de2066aa01 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
index 1d4b16ef779c93..76869e62541bab 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -586,7 +586,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -594,7 +594,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -666,7 +666,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -831,7 +831,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -3390,7 +3390,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -3398,7 +3398,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -3470,7 +3470,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -3635,7 +3635,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -3826,4 +3826,4 @@
"deviceIdentifier": 770
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 88743743e2318f..4511178aaa4411 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 0a08f10494129f..26131979baa2b0 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -952,7 +952,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -960,7 +960,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1032,7 +1032,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1197,7 +1197,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -8175,7 +8175,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8183,7 +8183,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8255,7 +8255,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -8420,7 +8420,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -14119,4 +14119,4 @@
"deviceIdentifier": 769
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 6c3c385b240d6f..11dcc16ed1e1f2 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -192,7 +192,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 29d98be9481cc1..39c029beaf0f46 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -952,7 +952,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -960,7 +960,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1032,7 +1032,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1197,7 +1197,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -10836,4 +10836,4 @@
"deviceIdentifier": 36
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index c5f0a52ad610ec..5f1bf7d6883c29 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -184,7 +184,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
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 43622fcd716ded..bcefd02ed6b7e4 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
@@ -952,7 +952,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -960,7 +960,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1032,7 +1032,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1197,7 +1197,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -8007,7 +8007,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8015,7 +8015,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -8087,7 +8087,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -8252,7 +8252,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -14690,7 +14690,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -14698,7 +14698,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -14770,7 +14770,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -14935,7 +14935,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -16903,4 +16903,4 @@
"deviceIdentifier": 263
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 04ac38ab832101..7347744516ff42 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -57,7 +57,7 @@ server cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 8c43771d53a73f..9552f2465188ad 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -659,7 +659,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -667,7 +667,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -739,7 +739,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -904,7 +904,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -4888,7 +4888,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -4896,7 +4896,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -4968,7 +4968,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -5133,7 +5133,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -7314,7 +7314,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7322,7 +7322,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -7394,7 +7394,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -7559,7 +7559,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
@@ -8041,4 +8041,4 @@
"deviceIdentifier": 514
}
]
-}
\ No newline at end of file
+}
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
index aca174b3804ab5..28b59cebf8fbb6 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
@@ -106,7 +106,7 @@ class BasicClientFragment : Fragment() {
private suspend fun readBasicClusters(itemIndex: Int) {
when(ATTRIBUTES[itemIndex]) {
- getString(R.string.basic_cluster_interaction_mode_version_text) -> sendReadInteractionModelVersionAttribute()
+ getString(R.string.basic_cluster_data_model_revision_text) -> sendReadDataModelRevisionAttribute()
getString(R.string.basic_cluster_vendor_name_text) -> sendReadVendorNameAttribute()
getString(R.string.basic_cluster_vendor_id_text) -> sendReadVendorIDAttribute()
getString(R.string.basic_cluster_product_name_text) -> sendReadProductNameAttribute()
@@ -129,7 +129,7 @@ class BasicClientFragment : Fragment() {
}
private fun makeAttributeList() {
- ATTRIBUTES.add(getString(R.string.basic_cluster_interaction_mode_version_text))
+ ATTRIBUTES.add(getString(R.string.basic_cluster_data_model_revision_text))
ATTRIBUTES.add(getString(R.string.basic_cluster_vendor_name_text))
ATTRIBUTES.add(getString(R.string.basic_cluster_vendor_id_text))
ATTRIBUTES.add(getString(R.string.basic_cluster_product_name_text))
@@ -150,16 +150,16 @@ class BasicClientFragment : Fragment() {
ATTRIBUTES.add(getString(R.string.basic_cluster_cluster_revision_text))
}
- private suspend fun sendReadInteractionModelVersionAttribute() {
- getBasicClusterForDevice().readInteractionModelVersionAttribute(object : ChipClusters.IntegerAttributeCallback {
+ private suspend fun sendReadDataModelRevisionAttribute() {
+ getBasicClusterForDevice().readDataModelRevisionAttribute(object : ChipClusters.IntegerAttributeCallback {
override fun onSuccess(value: Int) {
- Log.i(TAG,"[Read Success] InteractionModelVersion: $value")
- showMessage("[Read Success] InteractionModelVersion: $value")
+ Log.i(TAG,"[Read Success] DataModelRevision: $value")
+ showMessage("[Read Success] DataModelRevision: $value")
}
override fun onError(ex: Exception) {
- showMessage("Read InteractionModelVersion failure $ex")
- Log.e(TAG, "Read InteractionModelVersion failure", ex)
+ showMessage("Read DataModelRevision failure $ex")
+ Log.e(TAG, "Read DataModelRevision failure", ex)
}
})
}
diff --git a/src/android/CHIPTool/app/src/main/res/values/strings.xml b/src/android/CHIPTool/app/src/main/res/values/strings.xml
index 2ba82c650ca3e4..f3746b0b4bb8ea 100644
--- a/src/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/src/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -108,7 +108,7 @@
Enter Location
Set LocalConfigDisabled
Read Attribute
- InteractionModelVersion
+ DataModelRevision
VendorName
VendorID
ProductName
diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml
index fc1dda056f28a8..356b4f6c3c3a71 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml
@@ -23,9 +23,9 @@ tests:
cluster: "DelayCommands"
command: "WaitForCommissionee"
- - label: "Query Interaction Model Version"
+ - label: "Query Data Model Revision"
command: "readAttribute"
- attribute: "InteractionModelVersion"
+ attribute: "DataModelRevision"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml
index 79fdcb39a1e10b..a11b08690781d4 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml
@@ -31,9 +31,9 @@ tests:
- name: "message"
value: "*** Basic Cluster Tests Ready"
- - label: "Query Interaction Model Version"
+ - label: "Query Data Model Revision"
wait: "readAttribute"
- attribute: "InteractionModelVersion"
+ attribute: "DataModelRevision"
- label: "Query Vendor Name"
wait: "readAttribute"
diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
index be634fb80eb94a..f759d75c53069d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -26,7 +26,7 @@ limitations under the License.
which apply to the whole Node. Also allows setting user device information such as location.
- InteractionModelVersion
+ DataModelRevision
VendorName
VendorID
ProductName
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 215b422c29dc53..c5e983806d8eb1 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -269,7 +269,7 @@ client cluster Basic = 40 {
boolean reachableNewValue = 0;
}
- readonly attribute int16u interactionModelVersion = 0;
+ readonly attribute int16u dataModelRevision = 0;
readonly attribute char_string<32> vendorName = 1;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 0ba63470344165..8e431ab293df9d 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1919,7 +1919,7 @@
"commands": [],
"attributes": [
{
- "name": "InteractionModelVersion",
+ "name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -1927,7 +1927,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
@@ -1999,7 +1999,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2164,7 +2164,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index b910b790febf48..b436bc21ba0261 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -102,8 +102,8 @@ typedef void (*CHIPBarrierControlClusterAttributeListAttributeCallbackType)(
typedef void (*CHIPBarrierControlClusterClusterRevisionAttributeCallbackType)(
void *, chip::app::Clusters::BarrierControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPBasicClusterInteractionModelVersionAttributeCallbackType)(
- void *, chip::app::Clusters::Basic::Attributes::InteractionModelVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPBasicClusterDataModelRevisionAttributeCallbackType)(
+ void *, chip::app::Clusters::Basic::Attributes::DataModelRevision::TypeInfo::DecodableArgType);
typedef void (*CHIPBasicClusterVendorNameAttributeCallbackType)(
void *, chip::app::Clusters::Basic::Attributes::VendorName::TypeInfo::DecodableArgType);
typedef void (*CHIPBasicClusterVendorIDAttributeCallbackType)(
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index 53cc981bd87780..10099e6d249eb7 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -2032,7 +2032,7 @@ JNI_METHOD(jlong, BasicCluster, initWithDevice)(JNIEnv * env, jobject self, jlon
return reinterpret_cast(cppCluster);
}
-JNI_METHOD(void, BasicCluster, subscribeInteractionModelVersionAttribute)
+JNI_METHOD(void, BasicCluster, subscribeDataModelRevisionAttribute)
(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
{
chip::DeviceLayer::StackLock lock;
@@ -2054,9 +2054,9 @@ JNI_METHOD(void, BasicCluster, subscribeInteractionModelVersionAttribute)
chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
- using TypeInfo = chip::app::Clusters::Basic::Attributes::InteractionModelVersion::TypeInfo;
+ using TypeInfo = chip::app::Clusters::Basic::Attributes::DataModelRevision::TypeInfo;
auto successFn =
- chip::Callback::Callback::FromCancelable(onSuccess->Cancel());
+ chip::Callback::Callback::FromCancelable(onSuccess->Cancel());
auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel());
err = cppCluster->SubscribeAttribute(onSuccess->mContext, successFn->mCall, failureFn->mCall,
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index d752e05a73d206..a8611810663d04 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -1118,13 +1118,13 @@ public interface AttributeListAttributeCallback {
default void onSubscriptionEstablished() {}
}
- public void readInteractionModelVersionAttribute(IntegerAttributeCallback callback) {
- readInteractionModelVersionAttribute(chipClusterPtr, callback);
+ public void readDataModelRevisionAttribute(IntegerAttributeCallback callback) {
+ readDataModelRevisionAttribute(chipClusterPtr, callback);
}
- public void subscribeInteractionModelVersionAttribute(
+ public void subscribeDataModelRevisionAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeInteractionModelVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ subscribeDataModelRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
public void readVendorNameAttribute(CharStringAttributeCallback callback) {
@@ -1334,10 +1334,10 @@ public void subscribeClusterRevisionAttribute(
subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- private native void readInteractionModelVersionAttribute(
+ private native void readDataModelRevisionAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
- private native void subscribeInteractionModelVersionAttribute(
+ private native void subscribeDataModelRevisionAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readVendorNameAttribute(
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index f4fe4420851b3d..1dfef874ca8f18 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -504,20 +504,18 @@ public Map> getReadAttributeMap() {
"readClusterRevisionAttribute", readBarrierControlClusterRevisionAttributeInteractionInfo);
readAttributeMap.put("barrierControl", readBarrierControlInteractionInfo);
Map readBasicInteractionInfo = new LinkedHashMap<>();
- Map readBasicInteractionModelVersionCommandParams =
+ Map readBasicDataModelRevisionCommandParams =
new LinkedHashMap();
- InteractionInfo readBasicInteractionModelVersionAttributeInteractionInfo =
+ InteractionInfo readBasicDataModelRevisionAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.BasicCluster) cluster)
- .readInteractionModelVersionAttribute(
- (ChipClusters.IntegerAttributeCallback) callback);
+ .readDataModelRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
- readBasicInteractionModelVersionCommandParams);
+ readBasicDataModelRevisionCommandParams);
readBasicInteractionInfo.put(
- "readInteractionModelVersionAttribute",
- readBasicInteractionModelVersionAttributeInteractionInfo);
+ "readDataModelRevisionAttribute", readBasicDataModelRevisionAttributeInteractionInfo);
Map readBasicVendorNameCommandParams =
new LinkedHashMap();
InteractionInfo readBasicVendorNameAttributeInteractionInfo =
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index e632ca99c021a5..5bfa8c5f50a713 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -398,7 +398,7 @@ class ChipClusters:
},
"attributes": {
0x00000000: {
- "attributeName": "InteractionModelVersion",
+ "attributeName": "DataModelRevision",
"attributeId": 0x00000000,
"type": "int",
"reportable": True,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index b642a0b51ac309..9b81743f14645a 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -6070,7 +6070,7 @@ class Basic(Cluster):
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="interactionModelVersion", Tag=0x00000000, Type=uint),
+ ClusterObjectFieldDescriptor(Label="dataModelRevision", Tag=0x00000000, Type=uint),
ClusterObjectFieldDescriptor(Label="vendorName", Tag=0x00000001, Type=str),
ClusterObjectFieldDescriptor(Label="vendorID", Tag=0x00000002, Type=uint),
ClusterObjectFieldDescriptor(Label="productName", Tag=0x00000003, Type=str),
@@ -6094,7 +6094,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
])
- interactionModelVersion: 'uint' = None
+ dataModelRevision: 'uint' = None
vendorName: 'str' = None
vendorID: 'uint' = None
productName: 'str' = None
@@ -6136,7 +6136,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
class Attributes:
@dataclass
- class InteractionModelVersion(ClusterAttributeDescriptor):
+ class DataModelRevision(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0028
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
index d1893a723894d6..35412737f99ed4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
@@ -723,8 +723,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
case Clusters::Basic::Id: {
using namespace Clusters::Basic;
switch (aPath.mAttributeId) {
- case Attributes::InteractionModelVersion::Id: {
- using TypeInfo = Attributes::InteractionModelVersion::TypeInfo;
+ case Attributes::DataModelRevision::Id: {
+ using TypeInfo = Attributes::DataModelRevision::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
index 75189667414044..876c75de220657 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
@@ -388,14 +388,13 @@ NS_ASSUME_NONNULL_BEGIN
*/
@interface CHIPBasic : CHIPCluster
-- (void)readAttributeInteractionModelVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))completionHandler;
-- (void)subscribeAttributeInteractionModelVersionWithMinInterval:(uint16_t)minInterval
- maxInterval:(uint16_t)maxInterval
- subscriptionEstablished:
- (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))reportHandler;
+- (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDataModelRevisionWithMinInterval:(uint16_t)minInterval
+ maxInterval:(uint16_t)maxInterval
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:
+ (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
NSString * _Nullable value, NSError * _Nullable error))completionHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
index 764dc9b2c18904..886b5929f337ed 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
@@ -1471,28 +1471,27 @@ @implementation CHIPBasic
return &_cppCluster;
}
-- (void)readAttributeInteractionModelVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))completionHandler
+- (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))completionHandler
{
new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = Basic::Attributes::InteractionModelVersion::TypeInfo;
+ using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
-- (void)subscribeAttributeInteractionModelVersionWithMinInterval:(uint16_t)minInterval
- maxInterval:(uint16_t)maxInterval
- subscriptionEstablished:
- (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDataModelRevisionWithMinInterval:(uint16_t)minInterval
+ maxInterval:(uint16_t)maxInterval
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:
+ (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
new CHIPInt16uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = Basic::Attributes::InteractionModelVersion::TypeInfo;
+ using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
index 79c11bb23f5c95..b38dad0396dbac 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
@@ -124,8 +124,7 @@ NS_ASSUME_NONNULL_BEGIN
*/
@interface CHIPTestBasic : CHIPBasic
-- (void)writeAttributeInteractionModelVersionWithValue:(NSNumber * _Nonnull)value
- completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDataModelRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
index 9426ff8c99bd5b..c4f15433b024cb 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
@@ -909,8 +909,7 @@ @implementation CHIPTestBasic
return &_cppCluster;
}
-- (void)writeAttributeInteractionModelVersionWithValue:(NSNumber * _Nonnull)value
- completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDataModelRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
{
new CHIPDefaultSuccessCallbackBridge(
self.callbackQueue,
@@ -919,7 +918,7 @@ new CHIPDefaultSuccessCallbackBridge(
},
^(Cancelable * success, Cancelable * failure) {
ListFreer listFreer;
- using TypeInfo = Basic::Attributes::InteractionModelVersion::TypeInfo;
+ using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
TypeInfo::Type cppValue;
cppValue = value.unsignedShortValue;
auto successFn = Callback::FromCancelable(success);
diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
index fe6335c21f33bb..e8bd5ac41b6df2 100644
--- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
+++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
@@ -9953,15 +9953,15 @@ - (void)testSendClusterTest_TC_DM_1_1_000000_WaitForCommissionee
}
- (void)testSendClusterTest_TC_DM_1_1_000001_ReadAttribute
{
- XCTestExpectation * expectation = [self expectationWithDescription:@"Query Interaction Model Version"];
+ XCTestExpectation * expectation = [self expectationWithDescription:@"Query Data Model Revision"];
CHIPDevice * device = GetConnectedDevice();
dispatch_queue_t queue = dispatch_get_main_queue();
CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:queue];
XCTAssertNotNil(cluster);
- [cluster readAttributeInteractionModelVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
- NSLog(@"Query Interaction Model Version Error: %@", err);
+ [cluster readAttributeDataModelRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+ NSLog(@"Query Data Model Revision Error: %@", err);
XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index 222e0f0740d831..be32e093972a18 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -1535,8 +1535,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -1545,7 +1544,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -1568,7 +1568,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
index a1cacee2a70565..8fc456c05d8f0c 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
@@ -286,7 +286,7 @@
// Client attributes
// Server attributes
-#define ZCL_INTERACTION_MODEL_VERSION_ATTRIBUTE_ID (0x0000)
+#define ZCL_DATA_MODEL_REVISION_ATTRIBUTE_ID (0x0000)
#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0001)
#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0002)
#define ZCL_PRODUCT_NAME_ATTRIBUTE_ID (0x0003)
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index b5f5cfc51e5caf..0a636dcf8c365e 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -5547,7 +5547,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
namespace Basic {
namespace Attributes {
-namespace InteractionModelVersion {
+namespace DataModelRevision {
EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
{
@@ -5576,7 +5576,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
return emberAfWriteServerAttribute(endpoint, Clusters::Basic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
}
-} // namespace InteractionModelVersion
+} // namespace DataModelRevision
namespace VendorName {
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index 20081c37dd2f9c..8bd3040c40b70f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -1010,10 +1010,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
namespace Basic {
namespace Attributes {
-namespace InteractionModelVersion {
+namespace DataModelRevision {
EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace InteractionModelVersion
+} // namespace DataModelRevision
namespace VendorName {
EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index b43debeb754cad..801aad9a32b3c0 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -5719,8 +5719,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
{
switch (path.mAttributeId)
{
- case Attributes::InteractionModelVersion::TypeInfo::GetAttributeId():
- ReturnErrorOnFailure(DataModel::Decode(reader, interactionModelVersion));
+ case Attributes::DataModelRevision::TypeInfo::GetAttributeId():
+ ReturnErrorOnFailure(DataModel::Decode(reader, dataModelRevision));
break;
case Attributes::VendorName::TypeInfo::GetAttributeId():
ReturnErrorOnFailure(DataModel::Decode(reader, vendorName));
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 66f2ae3a8c4272..1ca33563f99158 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -7902,7 +7902,7 @@ struct DecodableType
namespace Attributes {
-namespace InteractionModelVersion {
+namespace DataModelRevision {
struct TypeInfo
{
using Type = uint16_t;
@@ -7910,10 +7910,10 @@ struct TypeInfo
using DecodableArgType = uint16_t;
static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
- static constexpr AttributeId GetAttributeId() { return Attributes::InteractionModelVersion::Id; }
+ static constexpr AttributeId GetAttributeId() { return Attributes::DataModelRevision::Id; }
static constexpr bool MustUseTimedWrite() { return false; }
};
-} // namespace InteractionModelVersion
+} // namespace DataModelRevision
namespace VendorName {
struct TypeInfo
{
@@ -8187,7 +8187,7 @@ struct TypeInfo
CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
- Attributes::InteractionModelVersion::TypeInfo::DecodableType interactionModelVersion = static_cast(0);
+ Attributes::DataModelRevision::TypeInfo::DecodableType dataModelRevision = static_cast(0);
Attributes::VendorName::TypeInfo::DecodableType vendorName;
Attributes::VendorID::TypeInfo::DecodableType vendorID = static_cast(0);
Attributes::ProductName::TypeInfo::DecodableType productName;
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
index 48eba7f365f1e0..2864de9ad87c27 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
@@ -948,9 +948,9 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
namespace Basic {
namespace Attributes {
-namespace InteractionModelVersion {
+namespace DataModelRevision {
static constexpr AttributeId Id = 0x00000000;
-} // namespace InteractionModelVersion
+} // namespace DataModelRevision
namespace VendorName {
static constexpr AttributeId Id = 0x00000001;
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
index 60919816456355..0860b95dc3fc0d 100644
--- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
@@ -636,8 +636,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -646,7 +645,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -669,7 +669,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index b09702273897dc..041522ee06a9a6 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -614,7 +614,7 @@ class BarrierControlBarrierControlStop : public ClusterCommand
| Commands: | |
|------------------------------------------------------------------------------|
| Attributes: | |
-| * InteractionModelVersion | 0x0000 |
+| * DataModelRevision | 0x0000 |
| * VendorName | 0x0001 |
| * VendorID | 0x0002 |
| * ProductName | 0x0003 |
@@ -9438,35 +9438,34 @@ void registerClusterBasic(Commands & commands, CredentialIssuerCommands * credsI
//
// Attributes
//
- make_unique(Id, credsIssuerConfig), //
- make_unique(Id, "interaction-model-version", Attributes::InteractionModelVersion::Id, credsIssuerConfig), //
- make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), //
- make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), //
- make_unique(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig), //
- make_unique(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig), //
- make_unique(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig), //
- make_unique(Id, "location", Attributes::Location::Id, credsIssuerConfig), //
- make_unique(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig), //
- make_unique(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
- make_unique(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig), //
- make_unique(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
- make_unique(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig), //
- make_unique(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig), //
- make_unique(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig), //
- make_unique(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig), //
- make_unique(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig), //
- make_unique(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig), //
- make_unique(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig), //
- make_unique(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig), //
- make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), //
- make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), //
- make_unique(Id, credsIssuerConfig), //
- make_unique(credsIssuerConfig), //
- make_unique(credsIssuerConfig), //
- make_unique(credsIssuerConfig), //
- make_unique(Id, credsIssuerConfig), //
- make_unique(Id, "interaction-model-version", Attributes::InteractionModelVersion::Id,
- credsIssuerConfig), //
+ make_unique(Id, credsIssuerConfig), //
+ make_unique(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig), //
+ make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), //
+ make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), //
+ make_unique(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig), //
+ make_unique(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig), //
+ make_unique(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig), //
+ make_unique(Id, "location", Attributes::Location::Id, credsIssuerConfig), //
+ make_unique(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig), //
+ make_unique(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
+ make_unique(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig), //
+ make_unique(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
+ make_unique(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig), //
+ make_unique(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig), //
+ make_unique(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig), //
+ make_unique(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig), //
+ make_unique(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig), //
+ make_unique(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig), //
+ make_unique(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig), //
+ make_unique(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig), //
+ make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), //
+ make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), //
+ make_unique(Id, credsIssuerConfig), //
+ make_unique(credsIssuerConfig), //
+ make_unique(credsIssuerConfig), //
+ make_unique(credsIssuerConfig), //
+ make_unique(Id, credsIssuerConfig), //
+ make_unique(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig), //
make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), //
make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), //
make_unique(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig), //
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 72cb5b221b544f..b05d09f1e72604 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -4062,10 +4062,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
case Basic::Id: {
switch (path.mAttributeId)
{
- case Basic::Attributes::InteractionModelVersion::Id: {
+ case Basic::Attributes::DataModelRevision::Id: {
uint16_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("InteractionModelVersion", 1, value);
+ return DataModelLogger::LogValue("DataModelRevision", 1, value);
}
case Basic::Attributes::VendorName::Id: {
chip::CharSpan value;
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index e1ab16d210a052..dcb2893724e222 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -16662,8 +16662,8 @@ class Test_TC_DM_1_1 : public TestCommand
err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
break;
case 1:
- ChipLogProgress(chipTool, " ***** Test Step 1 : Query Interaction Model Version\n");
- err = TestQueryInteractionModelVersion_1();
+ ChipLogProgress(chipTool, " ***** Test Step 1 : Query Data Model Revision\n");
+ err = TestQueryDataModelRevision_1();
break;
case 2:
ChipLogProgress(chipTool, " ***** Test Step 2 : Query Vendor Name\n");
@@ -16768,9 +16768,9 @@ class Test_TC_DM_1_1 : public TestCommand
(static_cast(context))->OnFailureResponse_1(error);
}
- static void OnSuccessCallback_1(void * context, uint16_t interactionModelVersion)
+ static void OnSuccessCallback_1(void * context, uint16_t dataModelRevision)
{
- (static_cast(context))->OnSuccessResponse_1(interactionModelVersion);
+ (static_cast(context))->OnSuccessResponse_1(dataModelRevision);
}
static void OnFailureCallback_2(void * context, CHIP_ERROR error)
@@ -16963,13 +16963,13 @@ class Test_TC_DM_1_1 : public TestCommand
return WaitForCommissionee();
}
- CHIP_ERROR TestQueryInteractionModelVersion_1()
+ CHIP_ERROR TestQueryDataModelRevision_1()
{
const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0;
chip::Controller::BasicClusterTest cluster;
cluster.Associate(mDevices[kIdentityAlpha], endpoint);
- ReturnErrorOnFailure(cluster.ReadAttribute(
+ ReturnErrorOnFailure(cluster.ReadAttribute(
this, OnSuccessCallback_1, OnFailureCallback_1));
return CHIP_NO_ERROR;
}
@@ -16980,9 +16980,9 @@ class Test_TC_DM_1_1 : public TestCommand
ThrowFailureResponse();
}
- void OnSuccessResponse_1(uint16_t interactionModelVersion)
+ void OnSuccessResponse_1(uint16_t dataModelRevision)
{
- VerifyOrReturn(CheckConstraintType("interactionModelVersion", "", "uint16"));
+ VerifyOrReturn(CheckConstraintType("dataModelRevision", "", "uint16"));
NextTest();
}
diff --git a/zzz_generated/door-lock-app/zap-generated/endpoint_config.h b/zzz_generated/door-lock-app/zap-generated/endpoint_config.h
index d071426def74d9..1cd35a559089d5 100644
--- a/zzz_generated/door-lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/door-lock-app/zap-generated/endpoint_config.h
@@ -636,8 +636,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -646,7 +645,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -669,7 +669,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
index 6bd4c144e73785..9f90f8ef28737f 100644
--- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
@@ -27,230 +27,225 @@
#define GENERATED_DEFAULTS \
{ \
\
- /* Endpoint: 0, Cluster: Basic (server), big-endian */ \
+ /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */ \
\
- /* 0 - SoftwareVersion, */ \
- 0x00, 0x00, 0x00, 0x00, \
+ /* 0 - Breadcrumb, */ \
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */ \
- \
- /* 4 - Breadcrumb, */ \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
- \
- /* 12 - FeatureMap, */ \
+ /* 8 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x06, \
\
/* Endpoint: 0, Cluster: Network Commissioning (server), big-endian */ \
\
- /* 16 - LastConnectErrorValue, */ \
+ /* 12 - LastConnectErrorValue, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 20 - FeatureMap, */ \
+ /* 16 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x01, \
\
/* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \
\
- /* 24 - UpTime, */ \
+ /* 20 - UpTime, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 32 - TotalOperationalHours, */ \
+ /* 28 - TotalOperationalHours, */ \
0x00, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: Software Diagnostics (server), big-endian */ \
\
- /* 36 - CurrentHeapFree, */ \
+ /* 32 - CurrentHeapFree, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 44 - CurrentHeapUsed, */ \
+ /* 40 - CurrentHeapUsed, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 52 - CurrentHeapHighWatermark, */ \
+ /* 48 - CurrentHeapHighWatermark, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 60 - FeatureMap, */ \
+ /* 56 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x01, \
\
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */ \
\
- /* 64 - NetworkName, */ \
+ /* 60 - NetworkName, */ \
0x00, 0x00, \
\
- /* 66 - ExtendedPanId, */ \
+ /* 62 - ExtendedPanId, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 74 - OverrunCount, */ \
+ /* 70 - OverrunCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 82 - PartitionId, */ \
+ /* 78 - PartitionId, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 86 - TxTotalCount, */ \
+ /* 82 - TxTotalCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 90 - TxUnicastCount, */ \
+ /* 86 - TxUnicastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 94 - TxBroadcastCount, */ \
+ /* 90 - TxBroadcastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 98 - TxAckRequestedCount, */ \
+ /* 94 - TxAckRequestedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 102 - TxAckedCount, */ \
+ /* 98 - TxAckedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 106 - TxNoAckRequestedCount, */ \
+ /* 102 - TxNoAckRequestedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 110 - TxDataCount, */ \
+ /* 106 - TxDataCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 114 - TxDataPollCount, */ \
+ /* 110 - TxDataPollCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 118 - TxBeaconCount, */ \
+ /* 114 - TxBeaconCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 122 - TxBeaconRequestCount, */ \
+ /* 118 - TxBeaconRequestCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 126 - TxOtherCount, */ \
+ /* 122 - TxOtherCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 130 - TxRetryCount, */ \
+ /* 126 - TxRetryCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 134 - TxDirectMaxRetryExpiryCount, */ \
+ /* 130 - TxDirectMaxRetryExpiryCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 138 - TxIndirectMaxRetryExpiryCount, */ \
+ /* 134 - TxIndirectMaxRetryExpiryCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 142 - TxErrCcaCount, */ \
+ /* 138 - TxErrCcaCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 146 - TxErrAbortCount, */ \
+ /* 142 - TxErrAbortCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 150 - TxErrBusyChannelCount, */ \
+ /* 146 - TxErrBusyChannelCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 154 - RxTotalCount, */ \
+ /* 150 - RxTotalCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 158 - RxUnicastCount, */ \
+ /* 154 - RxUnicastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 162 - RxBroadcastCount, */ \
+ /* 158 - RxBroadcastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 166 - RxDataCount, */ \
+ /* 162 - RxDataCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 170 - RxDataPollCount, */ \
+ /* 166 - RxDataPollCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 174 - RxBeaconCount, */ \
+ /* 170 - RxBeaconCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 178 - RxBeaconRequestCount, */ \
+ /* 174 - RxBeaconRequestCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 182 - RxOtherCount, */ \
+ /* 178 - RxOtherCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 186 - RxAddressFilteredCount, */ \
+ /* 182 - RxAddressFilteredCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 190 - RxDestAddrFilteredCount, */ \
+ /* 186 - RxDestAddrFilteredCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 194 - RxDuplicatedCount, */ \
+ /* 190 - RxDuplicatedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 198 - RxErrNoFrameCount, */ \
+ /* 194 - RxErrNoFrameCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 202 - RxErrUnknownNeighborCount, */ \
+ /* 198 - RxErrUnknownNeighborCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 206 - RxErrInvalidSrcAddrCount, */ \
+ /* 202 - RxErrInvalidSrcAddrCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 210 - RxErrSecCount, */ \
+ /* 206 - RxErrSecCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 214 - RxErrFcsCount, */ \
+ /* 210 - RxErrFcsCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 218 - RxErrOtherCount, */ \
+ /* 214 - RxErrOtherCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 222 - ActiveTimestamp, */ \
+ /* 218 - ActiveTimestamp, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 230 - PendingTimestamp, */ \
+ /* 226 - PendingTimestamp, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 238 - delay, */ \
+ /* 234 - delay, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 242 - ChannelMask, */ \
+ /* 238 - ChannelMask, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 249 - FeatureMap, */ \
+ /* 245 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x0F, \
\
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server), big-endian */ \
\
- /* 253 - BeaconLostCount, */ \
+ /* 249 - BeaconLostCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 257 - BeaconRxCount, */ \
+ /* 253 - BeaconRxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 261 - PacketMulticastRxCount, */ \
+ /* 257 - PacketMulticastRxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 265 - PacketMulticastTxCount, */ \
+ /* 261 - PacketMulticastTxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 269 - PacketUnicastRxCount, */ \
+ /* 265 - PacketUnicastRxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 273 - PacketUnicastTxCount, */ \
+ /* 269 - PacketUnicastTxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 277 - CurrentMaxRate, */ \
+ /* 273 - CurrentMaxRate, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 285 - OverrunCount, */ \
+ /* 281 - OverrunCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 293 - FeatureMap, */ \
+ /* 289 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x03, \
\
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server), big-endian */ \
\
- /* 297 - PacketRxCount, */ \
+ /* 293 - PacketRxCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 305 - PacketTxCount, */ \
+ /* 301 - PacketTxCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 313 - TxErrCount, */ \
+ /* 309 - TxErrCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 321 - CollisionCount, */ \
+ /* 317 - CollisionCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 329 - OverrunCount, */ \
+ /* 325 - OverrunCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 337 - TimeSinceReset, */ \
+ /* 333 - TimeSinceReset, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 345 - FeatureMap, */ \
+ /* 341 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x03, \
}
@@ -258,236 +253,231 @@
#define GENERATED_DEFAULTS \
{ \
\
- /* Endpoint: 0, Cluster: Basic (server), little-endian */ \
- \
- /* 0 - SoftwareVersion, */ \
- 0x00, 0x00, 0x00, 0x00, \
+ /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */ \
\
- /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */ \
+ /* 0 - Breadcrumb, */ \
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 4 - Breadcrumb, */ \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
- \
- /* 12 - FeatureMap, */ \
+ /* 8 - FeatureMap, */ \
0x06, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: Network Commissioning (server), little-endian */ \
\
- /* 16 - LastConnectErrorValue, */ \
+ /* 12 - LastConnectErrorValue, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 20 - FeatureMap, */ \
+ /* 16 - FeatureMap, */ \
0x01, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \
\
- /* 24 - UpTime, */ \
+ /* 20 - UpTime, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 32 - TotalOperationalHours, */ \
+ /* 28 - TotalOperationalHours, */ \
0x00, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: Software Diagnostics (server), little-endian */ \
\
- /* 36 - CurrentHeapFree, */ \
+ /* 32 - CurrentHeapFree, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 44 - CurrentHeapUsed, */ \
+ /* 40 - CurrentHeapUsed, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 52 - CurrentHeapHighWatermark, */ \
+ /* 48 - CurrentHeapHighWatermark, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 60 - FeatureMap, */ \
+ /* 56 - FeatureMap, */ \
0x01, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */ \
\
- /* 64 - NetworkName, */ \
+ /* 60 - NetworkName, */ \
0x00, 0x00, \
\
- /* 66 - ExtendedPanId, */ \
+ /* 62 - ExtendedPanId, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 74 - OverrunCount, */ \
+ /* 70 - OverrunCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 82 - PartitionId, */ \
+ /* 78 - PartitionId, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 86 - TxTotalCount, */ \
+ /* 82 - TxTotalCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 90 - TxUnicastCount, */ \
+ /* 86 - TxUnicastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 94 - TxBroadcastCount, */ \
+ /* 90 - TxBroadcastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 98 - TxAckRequestedCount, */ \
+ /* 94 - TxAckRequestedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 102 - TxAckedCount, */ \
+ /* 98 - TxAckedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 106 - TxNoAckRequestedCount, */ \
+ /* 102 - TxNoAckRequestedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 110 - TxDataCount, */ \
+ /* 106 - TxDataCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 114 - TxDataPollCount, */ \
+ /* 110 - TxDataPollCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 118 - TxBeaconCount, */ \
+ /* 114 - TxBeaconCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 122 - TxBeaconRequestCount, */ \
+ /* 118 - TxBeaconRequestCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 126 - TxOtherCount, */ \
+ /* 122 - TxOtherCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 130 - TxRetryCount, */ \
+ /* 126 - TxRetryCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 134 - TxDirectMaxRetryExpiryCount, */ \
+ /* 130 - TxDirectMaxRetryExpiryCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 138 - TxIndirectMaxRetryExpiryCount, */ \
+ /* 134 - TxIndirectMaxRetryExpiryCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 142 - TxErrCcaCount, */ \
+ /* 138 - TxErrCcaCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 146 - TxErrAbortCount, */ \
+ /* 142 - TxErrAbortCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 150 - TxErrBusyChannelCount, */ \
+ /* 146 - TxErrBusyChannelCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 154 - RxTotalCount, */ \
+ /* 150 - RxTotalCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 158 - RxUnicastCount, */ \
+ /* 154 - RxUnicastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 162 - RxBroadcastCount, */ \
+ /* 158 - RxBroadcastCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 166 - RxDataCount, */ \
+ /* 162 - RxDataCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 170 - RxDataPollCount, */ \
+ /* 166 - RxDataPollCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 174 - RxBeaconCount, */ \
+ /* 170 - RxBeaconCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 178 - RxBeaconRequestCount, */ \
+ /* 174 - RxBeaconRequestCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 182 - RxOtherCount, */ \
+ /* 178 - RxOtherCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 186 - RxAddressFilteredCount, */ \
+ /* 182 - RxAddressFilteredCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 190 - RxDestAddrFilteredCount, */ \
+ /* 186 - RxDestAddrFilteredCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 194 - RxDuplicatedCount, */ \
+ /* 190 - RxDuplicatedCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 198 - RxErrNoFrameCount, */ \
+ /* 194 - RxErrNoFrameCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 202 - RxErrUnknownNeighborCount, */ \
+ /* 198 - RxErrUnknownNeighborCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 206 - RxErrInvalidSrcAddrCount, */ \
+ /* 202 - RxErrInvalidSrcAddrCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 210 - RxErrSecCount, */ \
+ /* 206 - RxErrSecCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 214 - RxErrFcsCount, */ \
+ /* 210 - RxErrFcsCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 218 - RxErrOtherCount, */ \
+ /* 214 - RxErrOtherCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 222 - ActiveTimestamp, */ \
+ /* 218 - ActiveTimestamp, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 230 - PendingTimestamp, */ \
+ /* 226 - PendingTimestamp, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 238 - delay, */ \
+ /* 234 - delay, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 242 - ChannelMask, */ \
+ /* 238 - ChannelMask, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 249 - FeatureMap, */ \
+ /* 245 - FeatureMap, */ \
0x0F, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server), little-endian */ \
\
- /* 253 - BeaconLostCount, */ \
+ /* 249 - BeaconLostCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 257 - BeaconRxCount, */ \
+ /* 253 - BeaconRxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 261 - PacketMulticastRxCount, */ \
+ /* 257 - PacketMulticastRxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 265 - PacketMulticastTxCount, */ \
+ /* 261 - PacketMulticastTxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 269 - PacketUnicastRxCount, */ \
+ /* 265 - PacketUnicastRxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 273 - PacketUnicastTxCount, */ \
+ /* 269 - PacketUnicastTxCount, */ \
0x00, 0x00, 0x00, 0x00, \
\
- /* 277 - CurrentMaxRate, */ \
+ /* 273 - CurrentMaxRate, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 285 - OverrunCount, */ \
+ /* 281 - OverrunCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 293 - FeatureMap, */ \
+ /* 289 - FeatureMap, */ \
0x03, 0x00, 0x00, 0x00, \
\
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server), little-endian */ \
\
- /* 297 - PacketRxCount, */ \
+ /* 293 - PacketRxCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 305 - PacketTxCount, */ \
+ /* 301 - PacketTxCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 313 - TxErrCount, */ \
+ /* 309 - TxErrCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 321 - CollisionCount, */ \
+ /* 317 - CollisionCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 329 - OverrunCount, */ \
+ /* 325 - OverrunCount, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 337 - TimeSinceReset, */ \
+ /* 333 - TimeSinceReset, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* 345 - FeatureMap, */ \
+ /* 341 - FeatureMap, */ \
0x03, 0x00, 0x00, 0x00, \
}
#endif // BIGENDIAN_CPU
-#define GENERATED_DEFAULTS_COUNT (70)
+#define GENERATED_DEFAULTS_COUNT (69)
#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
#define ZAP_LONG_DEFAULTS_INDEX(index) \
@@ -535,31 +525,46 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* InteractionModelVersion */ \
- { 0x00000001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
- { 0x00000002, ZAP_TYPE(VENDOR_ID), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorID */ \
- { 0x00000003, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
- { 0x00000004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
+ { 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
+ { 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* VendorID */ \
+ { 0x00000003, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
+ { 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
- { 0x00000006, ZAP_TYPE(CHAR_STRING), 3, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
- ZAP_EMPTY_DEFAULT() }, /* Location */ \
- { 0x00000007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* HardwareVersion */ \
- { 0x00000008, ZAP_TYPE(CHAR_STRING), 65, ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ { 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
+ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ ZAP_EMPTY_DEFAULT() }, /* Location */ \
+ { 0x00000007, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* HardwareVersion */ \
+ { 0x00000008, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* HardwareVersionString */ \
- { 0x00000009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* SoftwareVersion */ \
- { 0x0000000A, ZAP_TYPE(CHAR_STRING), 65, ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* SoftwareVersion */ \
+ { 0x0000000A, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SoftwareVersionString */ \
- { 0x0000000B, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* ManufacturingDate */ \
- { 0x0000000C, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* PartNumber */ \
- { 0x0000000D, ZAP_TYPE(LONG_CHAR_STRING), 258, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* ProductURL */ \
- { 0x0000000E, ZAP_TYPE(CHAR_STRING), 65, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
- { 0x0000000F, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x0000000B, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* ManufacturingDate */ \
+ { 0x0000000C, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* PartNumber */ \
+ { 0x0000000D, ZAP_TYPE(LONG_CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* ProductURL */ \
+ { 0x0000000E, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
+ { 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
- { 0x00000012, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* UniqueID */ \
- { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \
+ { 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
+ ZAP_EMPTY_DEFAULT() }, /* UniqueID */ \
+ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
@@ -577,13 +582,13 @@
{ 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedLocales */ \
\
/* Endpoint: 0, Cluster: General Commissioning (server) */ \
- { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(4) }, /* Breadcrumb */ \
+ { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Breadcrumb */ \
{ 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* BasicCommissioningInfoList */ \
- { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* RegulatoryConfig */ \
- { 0x00000003, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* LocationCapability */ \
- { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(12) }, /* FeatureMap */ \
- { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
+ ZAP_EMPTY_DEFAULT() }, /* BasicCommissioningInfoList */ \
+ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* RegulatoryConfig */ \
+ { 0x00000003, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* LocationCapability */ \
+ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(8) }, /* FeatureMap */ \
+ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Network Commissioning (server) */ \
{ 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* MaxNetworks */ \
@@ -593,15 +598,15 @@
{ 0x00000004, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* InterfaceEnabled */ \
{ 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* LastNetworkingStatus */ \
{ 0x00000006, ZAP_TYPE(OCTET_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* LastNetworkID */ \
- { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(16) }, /* LastConnectErrorValue */ \
- { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(20) }, /* FeatureMap */ \
+ { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(12) }, /* LastConnectErrorValue */ \
+ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(16) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \
{ 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RebootCount */ \
- { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) }, /* UpTime */ \
- { 0x00000003, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* TotalOperationalHours */ \
+ { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(20) }, /* UpTime */ \
+ { 0x00000003, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(28) }, /* TotalOperationalHours */ \
{ 0x00000004, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \
{ 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \
@@ -612,23 +617,23 @@
\
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ThreadMetrics */ \
- { 0x00000001, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(36) }, /* CurrentHeapFree */ \
- { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(44) }, /* CurrentHeapUsed */ \
- { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(52) }, /* CurrentHeapHighWatermark */ \
- { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(60) }, /* FeatureMap */ \
+ { 0x00000001, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* CurrentHeapFree */ \
+ { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* CurrentHeapUsed */ \
+ { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(48) }, /* CurrentHeapHighWatermark */ \
+ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(56) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
{ 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \
- { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(64) }, /* NetworkName */ \
+ { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(60) }, /* NetworkName */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \
- { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(66) }, /* ExtendedPanId */ \
+ { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(62) }, /* ExtendedPanId */ \
{ 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \
- { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(74) }, /* OverrunCount */ \
+ { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(70) }, /* OverrunCount */ \
{ 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
{ 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */ \
- { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(82) }, /* PartitionId */ \
+ { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(78) }, /* PartitionId */ \
{ 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* weighting */ \
{ 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* DataVersion */ \
{ 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */ \
@@ -641,50 +646,50 @@
{ 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PartitionIdChangeCount */ \
{ 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* BetterPartitionAttachAttemptCount */ \
{ 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ParentChangeCount */ \
- { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(86) }, /* TxTotalCount */ \
- { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(90) }, /* TxUnicastCount */ \
- { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(94) }, /* TxBroadcastCount */ \
- { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(98) }, /* TxAckRequestedCount */ \
- { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(102) }, /* TxAckedCount */ \
- { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(106) }, /* TxNoAckRequestedCount */ \
- { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(110) }, /* TxDataCount */ \
- { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(114) }, /* TxDataPollCount */ \
- { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(118) }, /* TxBeaconCount */ \
- { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(122) }, /* TxBeaconRequestCount */ \
- { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(126) }, /* TxOtherCount */ \
- { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(130) }, /* TxRetryCount */ \
- { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(134) }, /* TxDirectMaxRetryExpiryCount */ \
- { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(138) }, /* TxIndirectMaxRetryExpiryCount */ \
- { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(142) }, /* TxErrCcaCount */ \
- { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(146) }, /* TxErrAbortCount */ \
- { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(150) }, /* TxErrBusyChannelCount */ \
- { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(154) }, /* RxTotalCount */ \
- { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(158) }, /* RxUnicastCount */ \
- { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(162) }, /* RxBroadcastCount */ \
- { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(166) }, /* RxDataCount */ \
- { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(170) }, /* RxDataPollCount */ \
- { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(174) }, /* RxBeaconCount */ \
- { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(178) }, /* RxBeaconRequestCount */ \
- { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(182) }, /* RxOtherCount */ \
- { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(186) }, /* RxAddressFilteredCount */ \
- { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(190) }, /* RxDestAddrFilteredCount */ \
- { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(194) }, /* RxDuplicatedCount */ \
- { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(198) }, /* RxErrNoFrameCount */ \
- { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(202) }, /* RxErrUnknownNeighborCount */ \
- { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(206) }, /* RxErrInvalidSrcAddrCount */ \
- { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(210) }, /* RxErrSecCount */ \
- { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(214) }, /* RxErrFcsCount */ \
- { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(218) }, /* RxErrOtherCount */ \
- { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(222) }, /* ActiveTimestamp */ \
- { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(230) }, /* PendingTimestamp */ \
- { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(238) }, /* delay */ \
+ { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(82) }, /* TxTotalCount */ \
+ { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(86) }, /* TxUnicastCount */ \
+ { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(90) }, /* TxBroadcastCount */ \
+ { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(94) }, /* TxAckRequestedCount */ \
+ { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(98) }, /* TxAckedCount */ \
+ { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(102) }, /* TxNoAckRequestedCount */ \
+ { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(106) }, /* TxDataCount */ \
+ { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(110) }, /* TxDataPollCount */ \
+ { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(114) }, /* TxBeaconCount */ \
+ { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(118) }, /* TxBeaconRequestCount */ \
+ { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(122) }, /* TxOtherCount */ \
+ { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(126) }, /* TxRetryCount */ \
+ { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(130) }, /* TxDirectMaxRetryExpiryCount */ \
+ { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(134) }, /* TxIndirectMaxRetryExpiryCount */ \
+ { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(138) }, /* TxErrCcaCount */ \
+ { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(142) }, /* TxErrAbortCount */ \
+ { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(146) }, /* TxErrBusyChannelCount */ \
+ { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(150) }, /* RxTotalCount */ \
+ { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(154) }, /* RxUnicastCount */ \
+ { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(158) }, /* RxBroadcastCount */ \
+ { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(162) }, /* RxDataCount */ \
+ { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(166) }, /* RxDataPollCount */ \
+ { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(170) }, /* RxBeaconCount */ \
+ { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(174) }, /* RxBeaconRequestCount */ \
+ { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(178) }, /* RxOtherCount */ \
+ { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(182) }, /* RxAddressFilteredCount */ \
+ { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(186) }, /* RxDestAddrFilteredCount */ \
+ { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(190) }, /* RxDuplicatedCount */ \
+ { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(194) }, /* RxErrNoFrameCount */ \
+ { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(198) }, /* RxErrUnknownNeighborCount */ \
+ { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(202) }, /* RxErrInvalidSrcAddrCount */ \
+ { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(206) }, /* RxErrSecCount */ \
+ { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(210) }, /* RxErrFcsCount */ \
+ { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(214) }, /* RxErrOtherCount */ \
+ { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(218) }, /* ActiveTimestamp */ \
+ { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(226) }, /* PendingTimestamp */ \
+ { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(234) }, /* delay */ \
{ 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \
- { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(242) }, /* ChannelMask */ \
+ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(238) }, /* ChannelMask */ \
{ 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \
{ 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \
- { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(249) }, /* FeatureMap */ \
+ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(245) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
@@ -693,28 +698,28 @@
{ 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* WiFiVersion */ \
{ 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ChannelNumber */ \
{ 0x00000004, ZAP_TYPE(INT8S), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Rssi */ \
- { 0x00000005, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(253) }, /* BeaconLostCount */ \
- { 0x00000006, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(257) }, /* BeaconRxCount */ \
- { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(261) }, /* PacketMulticastRxCount */ \
- { 0x00000008, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(265) }, /* PacketMulticastTxCount */ \
- { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(269) }, /* PacketUnicastRxCount */ \
- { 0x0000000A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(273) }, /* PacketUnicastTxCount */ \
- { 0x0000000B, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(277) }, /* CurrentMaxRate */ \
- { 0x0000000C, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(285) }, /* OverrunCount */ \
- { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(293) }, /* FeatureMap */ \
+ { 0x00000005, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(249) }, /* BeaconLostCount */ \
+ { 0x00000006, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(253) }, /* BeaconRxCount */ \
+ { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(257) }, /* PacketMulticastRxCount */ \
+ { 0x00000008, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(261) }, /* PacketMulticastTxCount */ \
+ { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(265) }, /* PacketUnicastRxCount */ \
+ { 0x0000000A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(269) }, /* PacketUnicastTxCount */ \
+ { 0x0000000B, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(273) }, /* CurrentMaxRate */ \
+ { 0x0000000C, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(281) }, /* OverrunCount */ \
+ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(289) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
{ 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* PHYRate */ \
{ 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* FullDuplex */ \
- { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(297) }, /* PacketRxCount */ \
- { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(305) }, /* PacketTxCount */ \
- { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(313) }, /* TxErrCount */ \
- { 0x00000005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(321) }, /* CollisionCount */ \
- { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(329) }, /* OverrunCount */ \
+ { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(293) }, /* PacketRxCount */ \
+ { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(301) }, /* PacketTxCount */ \
+ { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(309) }, /* TxErrCount */ \
+ { 0x00000005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(317) }, /* CollisionCount */ \
+ { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(325) }, /* OverrunCount */ \
{ 0x00000007, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CarrierDetect */ \
- { 0x00000008, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(337) }, /* TimeSinceReset */ \
- { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(345) }, /* FeatureMap */ \
+ { 0x00000008, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(333) }, /* TimeSinceReset */ \
+ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(341) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
@@ -811,7 +816,7 @@
{ 0x00000028, \
ZAP_ATTRIBUTE_INDEX(6), \
20, \
- 687, \
+ 39, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \
{ \
@@ -901,17 +906,17 @@
// This is an array of EmberAfEndpointType structures.
#define GENERATED_ENDPOINT_TYPES \
{ \
- { ZAP_CLUSTER_INDEX(0), 20, 1215 }, { ZAP_CLUSTER_INDEX(20), 8, 17 }, \
+ { ZAP_CLUSTER_INDEX(0), 20, 567 }, { ZAP_CLUSTER_INDEX(20), 8, 17 }, \
}
// Largest attribute size is needed for various buffers
#define ATTRIBUTE_LARGEST (401)
// Total size of singleton attributes
-#define ATTRIBUTE_SINGLETONS_SIZE (687)
+#define ATTRIBUTE_SINGLETONS_SIZE (39)
// Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (1232)
+#define ATTRIBUTE_MAX_SIZE (584)
// Number of fixed endpoints
#define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
index 1ac852f05ff647..941d95a8b965c4 100644
--- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
@@ -606,8 +606,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -616,7 +615,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -639,7 +639,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h
index 942a23abe17f16..523480dd39c5ed 100644
--- a/zzz_generated/lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h
@@ -618,8 +618,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -628,7 +627,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -651,7 +651,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h
index a7fc1db67f7978..bf82e7f693b46f 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h
@@ -153,7 +153,7 @@
{ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -162,7 +162,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -185,7 +186,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
index c39ef2d54d306e..c06e0ecf343947 100644
--- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
@@ -189,8 +189,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -199,7 +198,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -222,7 +222,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -298,8 +299,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -308,7 +308,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -331,7 +332,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
index 3a3db113b93a13..dfb34467ec6f83 100644
--- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
@@ -66,8 +66,8 @@ class Test_TC_DM_1_3_Simulated : public TestCommand
err = TestLogOnOffTestStartup_1();
break;
case 2:
- ChipLogProgress(chipTool, " ***** Test Step 2 : Query Interaction Model Version\n");
- err = TestQueryInteractionModelVersion_2();
+ ChipLogProgress(chipTool, " ***** Test Step 2 : Query Data Model Revision\n");
+ err = TestQueryDataModelRevision_2();
break;
case 3:
ChipLogProgress(chipTool, " ***** Test Step 3 : Query Vendor Name\n");
@@ -173,16 +173,15 @@ class Test_TC_DM_1_3_Simulated : public TestCommand
return Log("*** Basic Cluster Tests Ready");
}
- CHIP_ERROR TestQueryInteractionModelVersion_2()
+ CHIP_ERROR TestQueryDataModelRevision_2()
{
const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0;
- ChipLogError(chipTool,
- "[Endpoint: 0x%08x Cluster: Basic Attribute: InteractionModelVersion] Query Interaction Model Version",
+ ChipLogError(chipTool, "[Endpoint: 0x%08x Cluster: Basic Attribute: DataModelRevision] Query Data Model Revision",
endpoint);
ClearAttributeAndCommandPaths();
mAttributePath = chip::app::ConcreteAttributePath(endpoint, chip::app::Clusters::Basic::Id,
- chip::app::Clusters::Basic::Attributes::InteractionModelVersion::Id);
+ chip::app::Clusters::Basic::Attributes::DataModelRevision::Id);
return CHIP_NO_ERROR;
}
diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
index c39ef2d54d306e..c06e0ecf343947 100644
--- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
@@ -189,8 +189,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -199,7 +198,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -222,7 +222,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -298,8 +299,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -308,7 +308,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -331,7 +332,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
index 3a3db113b93a13..dfb34467ec6f83 100644
--- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
@@ -66,8 +66,8 @@ class Test_TC_DM_1_3_Simulated : public TestCommand
err = TestLogOnOffTestStartup_1();
break;
case 2:
- ChipLogProgress(chipTool, " ***** Test Step 2 : Query Interaction Model Version\n");
- err = TestQueryInteractionModelVersion_2();
+ ChipLogProgress(chipTool, " ***** Test Step 2 : Query Data Model Revision\n");
+ err = TestQueryDataModelRevision_2();
break;
case 3:
ChipLogProgress(chipTool, " ***** Test Step 3 : Query Vendor Name\n");
@@ -173,16 +173,15 @@ class Test_TC_DM_1_3_Simulated : public TestCommand
return Log("*** Basic Cluster Tests Ready");
}
- CHIP_ERROR TestQueryInteractionModelVersion_2()
+ CHIP_ERROR TestQueryDataModelRevision_2()
{
const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0;
- ChipLogError(chipTool,
- "[Endpoint: 0x%08x Cluster: Basic Attribute: InteractionModelVersion] Query Interaction Model Version",
+ ChipLogError(chipTool, "[Endpoint: 0x%08x Cluster: Basic Attribute: DataModelRevision] Query Data Model Revision",
endpoint);
ClearAttributeAndCommandPaths();
mAttributePath = chip::app::ConcreteAttributePath(endpoint, chip::app::Clusters::Basic::Id,
- chip::app::Clusters::Basic::Attributes::InteractionModelVersion::Id);
+ chip::app::Clusters::Basic::Attributes::DataModelRevision::Id);
return CHIP_NO_ERROR;
}
diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h
index 5e96679e6a40f0..8b18e9d54857d6 100644
--- a/zzz_generated/pump-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h
@@ -508,8 +508,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -518,7 +517,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -541,7 +541,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
index 76d381cbbf8ddf..d687729483eabd 100644
--- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
@@ -583,8 +583,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -593,7 +592,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -616,7 +616,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
index 1ed4bf68299606..4733c6a82a1ebb 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
@@ -306,8 +306,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -316,7 +315,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -339,7 +339,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h
index 4ca3694161a3c4..3b4e2cb3cee92c 100644
--- a/zzz_generated/thermostat/zap-generated/endpoint_config.h
+++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h
@@ -681,8 +681,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -691,7 +690,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -714,7 +714,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -940,8 +941,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -950,7 +950,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -973,7 +974,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h
index 687557986e6d16..ecb4f041235280 100644
--- a/zzz_generated/tv-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h
@@ -1038,8 +1038,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -1048,7 +1047,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -1071,7 +1071,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
index bddc4c32c8b0c5..a48c729d4381ce 100644
--- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
@@ -888,8 +888,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -898,7 +897,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -921,7 +921,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h
index 5766c56845b60f..c28982b5e8b067 100644
--- a/zzz_generated/window-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/window-app/zap-generated/endpoint_config.h
@@ -624,8 +624,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
- { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
- ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \
+ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(10) }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* VendorName */ \
{ 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -634,7 +633,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductName */ \
{ 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* ProductID */ \
- { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT() }, /* NodeLabel */ \
{ 0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
@@ -657,7 +657,8 @@
ZAP_EMPTY_DEFAULT() }, /* ProductLabel */ \
{ 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* SerialNumber */ \
- { 0x00000010, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
+ { 0x00000010, ZAP_TYPE(BOOLEAN), 1, \
+ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0) }, /* LocalConfigDisabled */ \
{ 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */ \
{ 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \