Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ZAP metadata in ZCL files. #20640

Merged
merged 2 commits into from
Jul 16, 2022
Merged

Update ZAP metadata in ZCL files. #20640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13460ce
Update ZAP metadata in ZCL files.
tecimovic Jul 12, 2022
91753ef
When doing ZCL file comparison, ignore differences in description.
tecimovic Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions scripts/tools/check_zcl_file_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ def main():
base_data["xmlFile"].sort()
ext_data["xmlFile"].sort()

# remove the description. That is expected to be different, so we
# will completely exclude it from the comparison.
del base_data["description"]
del ext_data["description"]

if base_data == ext_data:
return 0

Expand Down
4 changes: 3 additions & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"version": "ZCL Test Data",
"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": [
Expand Down