Skip to content

Commit

Permalink
Update ZAP metadata in ZCL files.
Browse files Browse the repository at this point in the history
With matter nearing release, the category of the ZCL data needs
to be differentiated, so zigbee pro stacks use "zigbee" category
and Matter stack uses "matter" category.

None of this affects generation, but it affects the user flow in
the UI, where user might be upgrading old Matter or old ZigbeePro
file, and this meta info helps determine which metafiles are
the ones that should be used for the upgrades.

It's important that this change makes it into the Matter SDK before
it becomes any kind of GA release to the customers, otherwise
when zap is upgrading from one to another version of Matter, it
will have to do guessing or ask the user for what to do.
  • Loading branch information
tecimovic committed Jul 12, 2022
1 parent 57cb679 commit b881d01
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 13 deletions.
29 changes: 23 additions & 6 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"version": "ZCL Test Data",
"description": "Matter SDK ZCL data with some extensions",
"category": "matter",
"version": 1,
"xmlRoot": [
".",
"./data-model/chip/",
Expand Down Expand Up @@ -84,9 +86,15 @@
"manufacturersXml": "../../../../third_party/zap/repo/zcl-builtin/shared/manufacturers.xml",
"options": {
"text": {
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
"defaultResponsePolicy": [
"Always",
"Conditional",
"Never"
]
},
"bool": ["commandDiscovery"]
"bool": [
"commandDiscovery"
]
},
"defaults": {
"text": {
Expand Down Expand Up @@ -129,7 +137,9 @@
"UniqueID",
"CapabilityMinima"
],
"Descriptor": ["ClusterRevision"],
"Descriptor": [
"ClusterRevision"
],
"Ethernet Network Diagnostics": [
"PHYRate",
"FullDuplex",
Expand Down Expand Up @@ -258,5 +268,12 @@
]
},
"defaultReportingPolicy": "mandatory",
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"]
}
"ZCLDataTypes": [
"ARRAY",
"BITMAP",
"ENUM",
"NUMBER",
"STRING",
"STRUCT"
]
}
35 changes: 28 additions & 7 deletions src/app/zap-templates/zcl/zcl.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"version": "ZCL Test Data",
"xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"],
"description": "Matter SDK ZCL data",
"category": "matter",
"version": 1,
"xmlRoot": [
".",
"./data-model/chip/",
"./data-model/silabs/"
],
"_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
"xmlFile": [
"access-control-definitions.xml",
Expand Down Expand Up @@ -78,9 +84,15 @@
"manufacturersXml": "../../../../third_party/zap/repo/zcl-builtin/shared/manufacturers.xml",
"options": {
"text": {
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
"defaultResponsePolicy": [
"Always",
"Conditional",
"Never"
]
},
"bool": ["commandDiscovery"]
"bool": [
"commandDiscovery"
]
},
"defaults": {
"text": {
Expand Down Expand Up @@ -123,7 +135,9 @@
"UniqueID",
"CapabilityMinima"
],
"Descriptor": ["ClusterRevision"],
"Descriptor": [
"ClusterRevision"
],
"Ethernet Network Diagnostics": [
"PHYRate",
"FullDuplex",
Expand Down Expand Up @@ -252,5 +266,12 @@
]
},
"defaultReportingPolicy": "mandatory",
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"]
}
"ZCLDataTypes": [
"ARRAY",
"BITMAP",
"ENUM",
"NUMBER",
"STRING",
"STRUCT"
]
}

0 comments on commit b881d01

Please sign in to comment.