Skip to content

Commit

Permalink
Basic Information cluster attribute cleanup (#14489)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@lzgrablic02
lzgrablic02 authored Feb 1, 2022
1 parent cb9b046 commit 9f16e9a
Show file tree
Hide file tree
Showing 82 changed files with 921 additions and 667 deletions.
1 change: 1 addition & 0 deletions .github/.wordlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ CYW
DAC
DAP
DataFrame
DataModelRevision
dataset
datasets
dbf
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/python_chip_controller_building.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ List available commands in cluster. For example, for _Basic_ cluster:
```
chip-device-ctrl > zcl ? Basic
InteractionModelVersion
DataModelRevision
VendorName
VendorID
ProductName
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
26 changes: 13 additions & 13 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1041,15 +1041,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -1121,7 +1121,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -1286,7 +1286,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -8901,15 +8901,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -8981,7 +8981,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -9146,7 +9146,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -18890,15 +18890,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -18970,7 +18970,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -19135,7 +19135,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -21103,4 +21103,4 @@
"deviceIdentifier": 256
}
]
}
}
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -264,7 +264,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -429,7 +429,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -4474,15 +4474,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -4554,7 +4554,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -4719,7 +4719,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -4977,4 +4977,4 @@
"deviceIdentifier": 257
}
]
}
}
2 changes: 1 addition & 1 deletion examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions examples/door-lock-app/door-lock-common/door-lock-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,15 +978,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -1058,7 +1058,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -1223,7 +1223,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -5580,15 +5580,15 @@
"commands": [],
"attributes": [
{
"name": "InteractionModelVersion",
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "10",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -5660,7 +5660,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -5825,7 +5825,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 1,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -7083,4 +7083,4 @@
"deviceIdentifier": 10
}
]
}
}
Loading

0 comments on commit 9f16e9a

Please sign in to comment.