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

Jump to bottom

Fix window covering XML and regen .zap files. #11055

Merged
merged 1 commit into from
Oct 27, 2021
Merged

Fix window covering XML and regen .zap files. #11055

merged 1 commit into from
Oct 27, 2021

Conversation

bzbarsky-apple
Copy link
Contributor

We had some changes to .xml files to rename things that were not reflected into .zap files. Running ./scripts/tools/zap_convert_all.py fixes that, but fails before this PR because ZAP support for is broken and #9246 introduced use of in window-covering.xml.

So the changes:

  1. Comment out the bits in
    src/app/zap-templates/zcl/data-model/chip/window-covering.xml.
  2. Run ./scripts/tools/zap_convert_all.py to fix up the attribute names in
    the .zap files.

Problem

See above.

Change overview

See above.

Testing

Reran code generation; no changes to generated code.

@bzbarsky-apple
Fix window covering XML and regen .zap files.
7ef6220 
We had some changes to .xml files to rename things that were not reflected into .zap files.  Running ./scripts/tools/zap_convert_all.py fixes that, but fails before this PR because ZAP support for <tag> is broken and project-chip#9246 introduced use of <tag> in window-covering.xml.

So the changes:

1) Comment out the <tag> bits in
   src/app/zap-templates/zcl/data-model/chip/window-covering.xml.
2) Run ./scripts/tools/zap_convert_all.py to fix up the attribute names in
   the .zap files.
@todo
Copy link

todo bot commented Oct 27, 2021

<tag> support seems to be broken in ZAP, leading to database

connectedhomeip/src/app/zap-templates/zcl/data-model/chip/window-covering.xml

Lines 24 to 32 in 7ef6220

<!-- TODO: <tag> support seems to be broken in ZAP, leading to database
constraint errors
<tag name="LF" description="Lift Control"/>
<tag name="TL" description="Tilt Control"/>
<tag name="PA" description="Position Aware"/>
<tag name="ABS" description="Absolute Positioning"/> -->
<globalAttribute side="server" code="0xFFFC" value="0x0001">
<featureBit tag="LF" bit="0">true</featureBit>
<featureBit tag="TL" bit="1">false</featureBit>

This comment was generated by todo based on a TODO comment in 7ef6220 in #11055. cc @bzbarsky-apple.

@andy31415
Copy link
Contributor

fast tracking: zap and xml file changes only

@andy31415 andy31415 merged commit 9a618bb into project-chip:master Oct 27, 2021
@todo todo bot mentioned this pull request Oct 27, 2021
Closed
@github-actions
Copy link

github-actions bot commented Oct 27, 2021 •
edited
Loading

PR #11055: Size comparison from 73bd219 to 7ef6220

Decreases (1 build for esp32)
platform target config section 73bd219 7ef6220 change % change
esp32 all-clusters-app m5stack (read only) 907223 907147 -76 -0.0
.flash.text 907223 907147 -76 -0.0
Full report (36 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 73bd219 7ef6220 change % change
efr32 lighting-app BRD4161A (read only) 737280 737280 0 0.0
(read/write) 115444 115444 0 0.0
.bss 113692 113692 0 0.0
.data 1752 1752 0 0.0
.text 737272 737272 0 0.0
BRD4161A+rpc (read only) 724712 724712 0 0.0
(read/write) 132052 132052 0 0.0
.bss 130196 130196 0 0.0
.data 1852 1852 0 0.0
.text 724704 724704 0 0.0
lock-app BRD4161A (read only) 716544 716544 0 0.0
(read/write) 113260 113260 0 0.0
.bss 111548 111548 0 0.0
.data 1712 1712 0 0.0
.text 716536 716536 0 0.0
window-app BRD4161A (read only) 717468 717468 0 0.0
(read/write) 113584 113584 0 0.0
.bss 111868 111868 0 0.0
.data 1716 1716 0 0.0
.text 717460 717460 0 0.0
esp32 all-clusters-app c3devkit (read only) 876062 876062 0 0.0
(read/write) 1306520 1306520 0 0.0
.dram0.bss 58248 58248 0 0.0
.dram0.data 16464 16464 0 0.0
.flash.rodata 198568 198568 0 0.0
.flash.text 876062 876062 0 0.0
.iram0.text 57564 57564 0 0.0
m5stack (read only) 907223 907147 -76 -0.0
(read/write) 426312 426312 0 0.0
.dram0.bss 60752 60752 0 0.0
.dram0.data 32084 32084 0 0.0
.flash.rodata 207312 207312 0 0.0
.flash.text 907223 907147 -76 -0.0
.iram0.text 125115 125115 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 701256 701256 0 0.0
.bss 78720 78720 0 0.0
.data 1900 1900 0 0.0
.text 614836 614836 0 0.0
lock-app k32w061+debug (read/write) 593060 593060 0 0.0
.bss 69196 69196 0 0.0
.data 1864 1864 0 0.0
.text 516200 516200 0 0.0
shell k32w061+debug (read/write) 425348 425348 0 0.0
.bss 63256 63256 0 0.0
.data 672 672 0 0.0
.text 359716 359716 0 0.0
linux all-clusters-app debug (read only) 1636385 1636385 0 0.0
(read/write) 117472 117472 0 0.0
.bss 50320 50320 0 0.0
.data 978 978 0 0.0
.data.rel.ro 60928 60928 0 0.0
.dynamic 592 592 0 0.0
.got 4088 4088 0 0.0
.init 27 27 0 0.0
.init_array 520 520 0 0.0
.rodata 135541 135541 0 0.0
.text 1369106 1369106 0 0.0
bridge-app debug+rpc (read only) 1277645 1277645 0 0.0
(read/write) 85096 85096 0 0.0
.bss 51856 51856 0 0.0
.data 976 976 0 0.0
.data.rel.ro 27272 27272 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 400 400 0 0.0
.rodata 110684 110684 0 0.0
.text 1071621 1071621 0 0.0
chip-tool debug (read only) 4174429 4174429 0 0.0
(read/write) 120896 120896 0 0.0
.bss 17680 17680 0 0.0
.data 1584 1584 0 0.0
.data.rel.ro 96208 96208 0 0.0
.dynamic 592 592 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 424 424 0 0.0
.rodata 212496 212496 0 0.0
.text 3702037 3702037 0 0.0
lighting-app debug+rpc (read only) 1529385 1529385 0 0.0
(read/write) 101520 101520 0 0.0
.bss 41176 41176 0 0.0
.data 1106 1106 0 0.0
.data.rel.ro 53968 53968 0 0.0
.dynamic 608 608 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 528 528 0 0.0
.rodata 127889 127889 0 0.0
.text 1269474 1269474 0 0.0
ota-provider-app debug (read only) 1236913 1236913 0 0.0
(read/write) 67776 67776 0 0.0
.bss 37440 37440 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24488 24488 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 440 440 0 0.0
.rodata 110984 110984 0 0.0
.text 1029970 1029970 0 0.0
ota-requestor-app debug (read only) 1294321 1294321 0 0.0
(read/write) 76264 76264 0 0.0
.bss 44960 44960 0 0.0
.data 816 816 0 0.0
.data.rel.ro 25352 25352 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 512 512 0 0.0
.rodata 127904 127904 0 0.0
.text 1068818 1068818 0 0.0
shell debug (read only) 780809 780809 0 0.0
(read/write) 57376 57376 0 0.0
.bss 16136 16136 0 0.0
.data 242 242 0 0.0
.data.rel.ro 36496 36496 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 336 336 0 0.0
.rodata 76527 76527 0 0.0
.text 603154 603154 0 0.0
tv-app debug (read only) 1756201 1756201 0 0.0
(read/write) 281432 281432 0 0.0
.bss 215568 215568 0 0.0
.data 2032 2032 0 0.0
.data.rel.ro 58192 58192 0 0.0
.dynamic 592 592 0 0.0
.got 4408 4408 0 0.0
.init 27 27 0 0.0
.init_array 608 608 0 0.0
.rodata 152984 152984 0 0.0
.text 1461506 1461506 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2288904 2288904 0 0.0
.bss 179612 179612 0 0.0
.data 5192 5192 0 0.0
.heap 851640 851640 0 0.0
.text 1251504 1251504 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2256088 2256088 0 0.0
.bss 171060 171060 0 0.0
.data 5464 5464 0 0.0
.heap 859920 859920 0 0.0
.text 1218688 1218688 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2234120 2234120 0 0.0
.bss 169988 169988 0 0.0
.data 5432 5432 0 0.0
.heap 861024 861024 0 0.0
.text 1196720 1196720 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139680 1139680 0 0.0
.bss 11760 11760 0 0.0
.data 4360 4360 0 0.0
.heap 1020328 1020328 0 0.0
.text 103064 103064 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 862983 862983 0 0.0
bss 112136 112136 0 0.0
rodata 97504 97504 0 0.0
text 577724 577724 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 823823 823823 0 0.0
bss 108380 108380 0 0.0
rodata 88280 88280 0 0.0
text 550916 550916 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 788022 788022 0 0.0
bss 113512 113512 0 0.0
rodata 92744 92744 0 0.0
text 507196 507196 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 839927 839927 0 0.0
bss 111208 111208 0 0.0
rodata 93904 93904 0 0.0
text 559284 559284 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 764970 764970 0 0.0
bss 112584 112584 0 0.0
rodata 89164 89164 0 0.0
text 488748 488748 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497339 497339 0 0.0
bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339456 339456 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 844327 844327 0 0.0
bss 111308 111308 0 0.0
rodata 95104 95104 0 0.0
text 562388 562388 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 839647 839647 0 0.0
bss 111208 111208 0 0.0
rodata 93880 93880 0 0.0
text 559028 559028 0 0.0
shell nrf52840dk_nrf52840 (read/write) 776531 776531 0 0.0
bss 109072 109072 0 0.0
rodata 72536 72536 0 0.0
text 520324 520324 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 691586 691586 0 0.0
bss 110056 110056 0 0.0
rodata 67180 67180 0 0.0
text 440936 440936 0 0.0
p6 lock-app default (read/write) 2169360 2169360 0 0.0
.bss 67184 67184 0 0.0
.data 2416 2416 0 0.0
.heap 963744 963744 0 0.0
.text 1127624 1127624 0 0.0
qpg lighting-app qpg6100+debug (read only) 491416 491416 0 0.0
(read/write) 114144 114144 0 0.0
.bss 52416 52416 0 0.0
.data 1000 1000 0 0.0
.text 486096 486096 0 0.0
lock-app qpg6100+debug (read only) 467636 467636 0 0.0
(read/write) 114140 114140 0 0.0
.bss 51368 51368 0 0.0
.data 956 956 0 0.0
.text 462316 462316 0 0.0
persistent-storage-app qpg6100+debug (read only) 155244 155244 0 0.0
(read/write) 114140 114140 0 0.0
.bss 27752 27752 0 0.0
.data 372 372 0 0.0
.text 149924 149924 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 664718 664718 0 0.0
bss 69944 69944 0 0.0
noinit 33216 33216 0 0.0
text 458320 458320 0 0.0

@bzbarsky-apple bzbarsky-apple deleted the fix-zap-files branch October 27, 2021 15:52
JasonLiuZhuoCheng pushed a commit to JasonLiuZhuoCheng/connectedhomeip that referenced this pull request Oct 28, 2021
@bzbarsky-apple @JasonLiuZhuoCheng
Fix window covering XML and regen .zap files. (project-chip#11055)
0614943 
We had some changes to .xml files to rename things that were not reflected into .zap files.  Running ./scripts/tools/zap_convert_all.py fixes that, but fails before this PR because ZAP support for <tag> is broken and project-chip#9246 introduced use of <tag> in window-covering.xml.

So the changes:

1) Comment out the <tag> bits in
   src/app/zap-templates/zcl/data-model/chip/window-covering.xml.
2) Run ./scripts/tools/zap_convert_all.py to fix up the attribute names in
   the .zap files.
carol-apple pushed a commit to carol-apple/connectedhomeip that referenced this pull request Oct 28, 2021
@bzbarsky-apple @carol-apple
Fix window covering XML and regen .zap files. (project-chip#11055)
6ded0df 
We had some changes to .xml files to rename things that were not reflected into .zap files.  Running ./scripts/tools/zap_convert_all.py fixes that, but fails before this PR because ZAP support for <tag> is broken and project-chip#9246 introduced use of <tag> in window-covering.xml.

So the changes:

1) Comment out the <tag> bits in
   src/app/zap-templates/zcl/data-model/chip/window-covering.xml.
2) Run ./scripts/tools/zap_convert_all.py to fix up the attribute names in
   the .zap files.
PSONALl pushed a commit to PSONALl/connectedhomeip that referenced this pull request Dec 3, 2021
@bzbarsky-apple
Fix window covering XML and regen .zap files. (project-chip#11055)
c0008ab 
We had some changes to .xml files to rename things that were not reflected into .zap files.  Running ./scripts/tools/zap_convert_all.py fixes that, but fails before this PR because ZAP support for <tag> is broken and project-chip#9246 introduced use of <tag> in window-covering.xml.

So the changes:

1) Comment out the <tag> bits in
   src/app/zap-templates/zcl/data-model/chip/window-covering.xml.
2) Run ./scripts/tools/zap_convert_all.py to fix up the attribute names in
   the .zap files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@anush-apple anush-apple Awaiting requested review from anush-apple

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@LuDuda LuDuda Awaiting requested review from LuDuda

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@pan-apple pan-apple Awaiting requested review from pan-apple

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
app controller examples fast track review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bzbarsky-apple @andy31415