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.

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

Updated the door-lock-cluster.xml door-lock-cluster.xml to use the sp… #15600

Merged

Conversation

hubTab
Copy link
Contributor

@hubTab hubTab commented Feb 25, 2022

Updated the DoorLock Cluster XML to use type definitions.

Problem

What is being fixed?

Change overview

What's in this PR

  • Updated the door-lock-cluster.xml door-lock-cluster.xml to use the specifications type definitions, instead of using the enum* directly.
  • Also, fixed the comment in the ManualOperationEventMask attribute bit meaning set.

Testing

How was this tested? (at least one bullet point required)

  • Regenerated all ZAP cluster code, by running ./scripts/tools/zap_regen_all.py. Compared the generated code versus the original zzz_generated. The differences are highlighted in the attached zip file, all indicating the expected type changes.
    CSA-15528-Test-Report.zip

@andy31415
Copy link
Contributor

/rebase

@woody-apple woody-apple force-pushed the DoorLock_Type_Update_Issue_15528 branch from 4c4debe to 4501ac3 Compare February 28, 2022 19:27
@github-actions
Copy link

github-actions bot commented Feb 28, 2022

PR #15600: Size comparison from 9e480df to 4501ac3

Increases above 0.2%:

platform target config section 9e480df 4501ac3 change % change
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1038939 1075259 36320 3.5
bss 125756 127608 1852 1.5
rodata 135900 141804 5904 4.3
text 700076 728436 28360 4.1
Increases (1 build for nrfconnect)
platform target config section 9e480df 4501ac3 change % change
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1038939 1075259 36320 3.5
bss 125756 127608 1852 1.5
rodata 135900 141804 5904 4.3
text 700076 728436 28360 4.1
Full report (31 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 9e480df 4501ac3 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 599582 599582 0 0.0
.app_xip_area 504428 504428 0 0.0
.bss 77844 77844 0 0.0
.data 652 652 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 557614 557614 0 0.0
.app_xip_area 463996 463996 0 0.0
.bss 76348 76348 0 0.0
.data 616 616 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 578138 578138 0 0.0
.app_xip_area 475088 475088 0 0.0
.bss 85452 85452 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 916516 916516 0 0.0
(read/write) 128608 128608 0 0.0
.bss 126560 126560 0 0.0
.data 2048 2048 0 0.0
.text 916508 916508 0 0.0
BRD4161A+rpc (read only) 946604 946604 0 0.0
(read/write) 145548 145548 0 0.0
.bss 143336 143336 0 0.0
.data 2212 2212 0 0.0
.text 946596 946596 0 0.0
lock-app BRD4161A+wf200 (read only) 986436 986436 0 0.0
(read/write) 120360 120360 0 0.0
.bss 118436 118436 0 0.0
.data 1924 1924 0 0.0
.text 986428 986428 0 0.0
window-app BRD4161A (read only) 850596 850596 0 0.0
(read/write) 126844 126844 0 0.0
.bss 124928 124928 0 0.0
.data 1916 1916 0 0.0
.text 850588 850588 0 0.0
esp32 all-clusters-app c3devkit (read only) 956574 956574 0 0.0
(read/write) 1392986 1392986 0 0.0
.dram0.bss 62592 62592 0 0.0
.dram0.data 14228 14228 0 0.0
.flash.rodata 197248 197248 0 0.0
.flash.text 956574 956574 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1004711 1004711 0 0.0
(read/write) 458264 458264 0 0.0
.dram0.bss 68096 68096 0 0.0
.dram0.data 34072 34072 0 0.0
.flash.rodata 224600 224600 0 0.0
.flash.text 999327 999327 0 0.0
.iram0.text 122767 122767 0 0.0
k32w light k32w061+release (read/write) 691904 691904 0 0.0
.bss 77480 77480 0 0.0
.data 1924 1924 0 0.0
.text 606700 606700 0 0.0
lock k32w061+release (read/write) 695176 695176 0 0.0
.bss 77688 77688 0 0.0
.data 1964 1964 0 0.0
.text 609724 609724 0 0.0
linux all-clusters-app debug (read only) 2395017 2395017 0 0.0
(read/write) 144696 144696 0 0.0
.bss 59232 59232 0 0.0
.data 1360 1360 0 0.0
.data.rel.ro 78392 78392 0 0.0
.dynamic 592 592 0 0.0
.got 4160 4160 0 0.0
.init 27 27 0 0.0
.init_array 912 912 0 0.0
.rodata 204869 204869 0 0.0
.text 2027378 2027378 0 0.0
bridge-app debug+rpc (read only) 1720741 1720741 0 0.0
(read/write) 92744 92744 0 0.0
.bss 47552 47552 0 0.0
.data 2042 2042 0 0.0
.data.rel.ro 38088 38088 0 0.0
.dynamic 592 592 0 0.0
.got 3912 3912 0 0.0
.init 27 27 0 0.0
.init_array 544 544 0 0.0
.rodata 141460 141460 0 0.0
.text 1463477 1463477 0 0.0
chip-tool debug (read only) 9003445 9003445 0 0.0
(read/write) 298816 298816 0 0.0
.bss 40448 40448 0 0.0
.data 1164 1164 0 0.0
.data.rel.ro 251144 251144 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 481205 481205 0 0.0
.text 7913333 7913333 0 0.0
chip-tool-ipv6only arm64 (read only) 8757484 8757484 0 0.0
(read/write) 412049 412049 0 0.0
.bss 58673 58673 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 296840 296840 0 0.0
.dynamic 560 560 0 0.0
.got 51512 51512 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 457028 457028 0 0.0
.text 7435172 7435172 0 0.0
door-lock-app debug (read only) 1936305 1936305 0 0.0
(read/write) 119136 119136 0 0.0
.bss 50496 50496 0 0.0
.data 1050 1050 0 0.0
.data.rel.ro 62200 62200 0 0.0
.dynamic 592 592 0 0.0
.got 4096 4096 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 173532 173532 0 0.0
.text 1614290 1614290 0 0.0
lighting-app debug+rpc (read only) 2071505 2071505 0 0.0
(read/write) 124496 124496 0 0.0
.bss 51424 51424 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 66144 66144 0 0.0
.dynamic 608 608 0 0.0
.got 4128 4128 0 0.0
.init 27 27 0 0.0
.init_array 712 712 0 0.0
.rodata 166225 166225 0 0.0
.text 1749826 1749826 0 0.0
ota-provider-app debug (read only) 1868393 1868393 0 0.0
(read/write) 114800 114800 0 0.0
.bss 50368 50368 0 0.0
.data 1320 1320 0 0.0
.data.rel.ro 57480 57480 0 0.0
.dynamic 608 608 0 0.0
.got 4352 4352 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 158707 158707 0 0.0
.text 1559122 1559122 0 0.0
ota-requestor-app debug (read only) 1879369 1879369 0 0.0
(read/write) 116568 116568 0 0.0
.bss 51232 51232 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 58744 58744 0 0.0
.dynamic 592 592 0 0.0
.got 4152 4152 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 152420 152420 0 0.0
.text 1578114 1578114 0 0.0
shell debug (read only) 2363201 2363201 0 0.0
(read/write) 147176 147176 0 0.0
.bss 67552 67552 0 0.0
.data 864 864 0 0.0
.data.rel.ro 73096 73096 0 0.0
.dynamic 592 592 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 896 896 0 0.0
.rodata 204786 204786 0 0.0
.text 2001858 2001858 0 0.0
thermostat-no-ble arm64 (read only) 2163236 2163236 0 0.0
(read/write) 148577 148577 0 0.0
.bss 65265 65265 0 0.0
.data 1056 1056 0 0.0
.data.rel.ro 75080 75080 0 0.0
.dynamic 560 560 0 0.0
.got 4216 4216 0 0.0
.init 24 24 0 0.0
.init_array 352 352 0 0.0
.rodata 132964 132964 0 0.0
.text 1811968 1811968 0 0.0
tv-app debug (read only) 2589505 2589505 0 0.0
(read/write) 148632 148632 0 0.0
.bss 65824 65824 0 0.0
.data 3168 3168 0 0.0
.data.rel.ro 73624 73624 0 0.0
.dynamic 592 592 0 0.0
.got 4528 4528 0 0.0
.init 27 27 0 0.0
.init_array 880 880 0 0.0
.rodata 198653 198653 0 0.0
.text 2217090 2217090 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2350140 2350140 0 0.0
.bss 187092 187092 0 0.0
.data 5776 5776 0 0.0
.text 1312740 1312740 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1038939 1075259 36320 3.5
bss 125756 127608 1852 1.5
rodata 135900 141804 5904 4.3
text 700076 728436 28360 4.1
p6 all-clusters-app default (read/write) 2488104 2488104 0 0.0
.bss 118664 118664 0 0.0
.data 2688 2688 0 0.0
.text 1446368 1446368 0 0.0
light-app default (read/write) 2395304 2395304 0 0.0
.bss 112984 112984 0 0.0
.data 2536 2536 0 0.0
.text 1353568 1353568 0 0.0
lock-app default (read/write) 2358880 2358880 0 0.0
.bss 112728 112728 0 0.0
.data 2496 2496 0 0.0
.text 1317144 1317144 0 0.0
qpg lighting-app qpg6105+debug (read only) 601200 601200 0 0.0
(read/write) 146936 146936 0 0.0
.bss 90904 90904 0 0.0
.data 1124 1124 0 0.0
.text 595880 595880 0 0.0
lock-app qpg6105+debug (read only) 566964 566964 0 0.0
(read/write) 146936 146936 0 0.0
.bss 90912 90912 0 0.0
.data 1076 1076 0 0.0
.text 561644 561644 0 0.0
persistent-storage-app qpg6105+debug (read only) 99536 99536 0 0.0
(read/write) 146941 146941 0 0.0
.bss 24001 24001 0 0.0
.data 180 180 0 0.0
.text 94216 94216 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 883126 883126 0 0.0
bss 86336 86336 0 0.0
noinit 37160 37160 0 0.0
text 623982 623982 0 0.0

@woody-apple
Copy link
Contributor

Fast tracking, given this has had enough time for review.

@hubTab Can you please regen zap?

@hubTab
Copy link
Contributor Author

hubTab commented Mar 2, 2022

@woody-apple ,
This PR is dependent on PR #15697. Waiting for it be merged into master, to be able to regen zap. (scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug already verified)

@hubTab
Copy link
Contributor Author

hubTab commented Mar 3, 2022

I would like to acknowledge @mrjerryjohns immediate response in addressing the lack of support for Strongly Typed Bitmaps. Once it is in, we will proceed with this PR.

@hubTab
Copy link
Contributor Author

hubTab commented Mar 14, 2022

Just confirming that as PR #15697 has been merged into master , I am working on rebasing this PR on master, and verify it checks running the two tests, before merging this PR into master.

@hubTab
Copy link
Contributor Author

hubTab commented Mar 14, 2022

@woody-apple , @bzbarsky-apple , @mrjerryjohns ,

This PR has been rebased on the master branch, which now includes the #15697 fix. I confirm that this PR successfully built both the all-cluster-app and the chip-tool apps. In addition it includes the regenerated the zzz code, being ready to be merged in back into master. Since I do not have the rights to proceed with the merge, can one of you please help merge it in?

Thanks!
Eugen

…ecifications type definitions, instead of using the enum* directly (project-chip#15528).

Fixed the ManualOperationEventMask comment.
Rebuilt all-clusters-app, chip-tool, and re-generated zzz files.

Note: In the review process, it has been noted that the GetLogRecordResponse command documents the EventType as an enum8.
However the spec does not define the EventTypeEnum, which could be easily added to the spec as the Event Type is a textual description.
@hubTab hubTab force-pushed the DoorLock_Type_Update_Issue_15528 branch from 84d1c6e to 9b5a1d3 Compare March 14, 2022 23:06
@github-actions
Copy link

github-actions bot commented Mar 15, 2022

PR #15600: Size comparison from b18b03a to 9b5a1d3

Increases above 0.2%:

platform target config section b18b03a 9b5a1d3 change % change
linux chip-tool debug (read only) 10095037 10125373 30336 0.3
.text 8798789 8829125 30336 0.3
chip-tool-ipv6only arm64 (read only) 9728092 9752652 24560 0.3
.text 8186052 8210612 24560 0.3
Increases (3 builds for esp32, linux)
platform target config section b18b03a 9b5a1d3 change % change
esp32 all-clusters-app m5stack (read only) 1017011 1017035 24 0.0
.flash.text 1011627 1011651 24 0.0
linux chip-tool debug (read only) 10095037 10125373 30336 0.3
.text 8798789 8829125 30336 0.3
chip-tool-ipv6only arm64 (read only) 9728092 9752652 24560 0.3
.text 8186052 8210612 24560 0.3
Full report (27 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section b18b03a 9b5a1d3 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 602578 602578 0 0.0
.app_xip_area 509756 509756 0 0.0
.bss 75576 75576 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 560430 560430 0 0.0
.app_xip_area 469136 469136 0 0.0
.bss 74080 74080 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 570498 570498 0 0.0
.app_xip_area 469556 469556 0 0.0
.bss 83384 83384 0 0.0
.data 520 520 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 919652 919652 0 0.0
(read/write) 128672 128672 0 0.0
.bss 126664 126664 0 0.0
.data 2008 2008 0 0.0
.text 919644 919644 0 0.0
BRD4161A+rpc (read only) 948440 948440 0 0.0
(read/write) 144632 144632 0 0.0
.bss 142440 142440 0 0.0
.data 2188 2188 0 0.0
.text 948432 948432 0 0.0
window-app BRD4161A (read only) 850392 850392 0 0.0
(read/write) 126632 126632 0 0.0
.bss 124768 124768 0 0.0
.data 1864 1864 0 0.0
.text 850384 850384 0 0.0
esp32 all-clusters-app c3devkit (read only) 961388 961388 0 0.0
(read/write) 1394938 1394938 0 0.0
.dram0.bss 64056 64056 0 0.0
.dram0.data 14188 14188 0 0.0
.flash.rodata 197776 197776 0 0.0
.flash.text 961388 961388 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1017011 1017035 24 0.0
(read/write) 462148 462148 0 0.0
.dram0.bss 69576 69576 0 0.0
.dram0.data 34016 34016 0 0.0
.flash.rodata 226720 226720 0 0.0
.flash.text 1011627 1011651 24 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 699340 699340 0 0.0
.bss 77560 77560 0 0.0
.data 1888 1888 0 0.0
.text 614092 614092 0 0.0
lock k32w061+release (read/write) 699644 699644 0 0.0
.bss 77552 77552 0 0.0
.data 1908 1908 0 0.0
.text 614384 614384 0 0.0
linux all-clusters-app debug (read only) 2465225 2465225 0 0.0
(read/write) 146352 146352 0 0.0
.bss 60640 60640 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 78728 78728 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 210693 210693 0 0.0
.text 2091298 2091298 0 0.0
bridge-app debug+rpc (read only) 1749757 1749757 0 0.0
(read/write) 92912 92912 0 0.0
.bss 47752 47752 0 0.0
.data 1952 1952 0 0.0
.data.rel.ro 38128 38128 0 0.0
.dynamic 592 592 0 0.0
.got 3920 3920 0 0.0
.init 27 27 0 0.0
.init_array 544 544 0 0.0
.rodata 143308 143308 0 0.0
.text 1490901 1490901 0 0.0
chip-tool debug (read only) 10095037 10125373 30336 0.3
(read/write) 357680 357680 0 0.0
.bss 25696 25696 0 0.0
.data 1072 1072 0 0.0
.data.rel.ro 324864 324864 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 514997 514997 0 0.0
.text 8798789 8829125 30336 0.3
chip-tool-ipv6only arm64 (read only) 9728092 9752652 24560 0.3
(read/write) 475425 475425 0 0.0
.bss 44017 44017 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 371232 371232 0 0.0
.dynamic 560 560 0 0.0
.got 55256 55256 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 492196 492196 0 0.0
.text 8186052 8210612 24560 0.3
door-lock-app debug (read only) 1984385 1984385 0 0.0
(read/write) 119776 119776 0 0.0
.bss 50944 50944 0 0.0
.data 992 992 0 0.0
.data.rel.ro 62456 62456 0 0.0
.dynamic 592 592 0 0.0
.got 4104 4104 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 178396 178396 0 0.0
.text 1657090 1657090 0 0.0
lighting-app debug+rpc (read only) 2115961 2115961 0 0.0
(read/write) 125160 125160 0 0.0
.bss 51776 51776 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 66408 66408 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 170940 170940 0 0.0
.text 1789106 1789106 0 0.0
ota-provider-app debug (read only) 1918537 1918537 0 0.0
(read/write) 115536 115536 0 0.0
.bss 50816 50816 0 0.0
.data 1288 1288 0 0.0
.data.rel.ro 57816 57816 0 0.0
.dynamic 608 608 0 0.0
.got 4360 4360 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 164267 164267 0 0.0
.text 1603266 1603266 0 0.0
ota-requestor-app debug (read only) 1949249 1949249 0 0.0
(read/write) 118568 118568 0 0.0
.bss 51840 51840 0 0.0
.data 1416 1416 0 0.0
.data.rel.ro 59880 59880 0 0.0
.dynamic 592 592 0 0.0
.got 4152 4152 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 160452 160452 0 0.0
.text 1637570 1637570 0 0.0
shell debug (read only) 2411385 2411385 0 0.0
(read/write) 150184 150184 0 0.0
.bss 70600 70600 0 0.0
.data 784 784 0 0.0
.data.rel.ro 73088 73088 0 0.0
.dynamic 592 592 0 0.0
.got 4152 4152 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 207474 207474 0 0.0
.text 2047762 2047762 0 0.0
thermostat-no-ble arm64 (read only) 2207236 2207236 0 0.0
(read/write) 149377 149377 0 0.0
.bss 65649 65649 0 0.0
.data 1024 1024 0 0.0
.data.rel.ro 75368 75368 0 0.0
.dynamic 560 560 0 0.0
.got 4352 4352 0 0.0
.init 24 24 0 0.0
.init_array 360 360 0 0.0
.rodata 136756 136756 0 0.0
.text 1851168 1851168 0 0.0
tv-app debug (read only) 2656097 2656097 0 0.0
(read/write) 250776 250776 0 0.0
.bss 167840 167840 0 0.0
.data 3104 3104 0 0.0
.data.rel.ro 73800 73800 0 0.0
.dynamic 592 592 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 880 880 0 0.0
.rodata 204213 204213 0 0.0
.text 2277826 2277826 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2352756 2352756 0 0.0
.bss 186652 186652 0 0.0
.data 5752 5752 0 0.0
.text 1315356 1315356 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1154011 1154011 0 0.0
bss 146644 146644 0 0.0
rodata 145276 145276 0 0.0
text 786976 786976 0 0.0
p6 all-clusters-app default (read/write) 2492152 2492152 0 0.0
.bss 120080 120080 0 0.0
.data 2632 2632 0 0.0
.text 1450416 1450416 0 0.0
light-app default (read/write) 2396000 2396000 0 0.0
.bss 113544 113544 0 0.0
.data 2488 2488 0 0.0
.text 1354264 1354264 0 0.0
lock-app default (read/write) 2359544 2359544 0 0.0
.bss 113288 113288 0 0.0
.data 2448 2448 0 0.0
.text 1317808 1317808 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 893770 893770 0 0.0
bss 87432 87432 0 0.0
noinit 37160 37160 0 0.0
text 631868 631868 0 0.0

@mrjerryjohns mrjerryjohns merged commit 2fd0f7f into project-chip:master Mar 15, 2022
andrei-menzopol pushed a commit to andrei-menzopol/connectedhomeip that referenced this pull request Apr 14, 2022
…ecifications type definitions, instead of using the enum* directly (project-chip#15528). (project-chip#15600)

Fixed the ManualOperationEventMask comment.
Rebuilt all-clusters-app, chip-tool, and re-generated zzz files.

Note: In the review process, it has been noted that the GetLogRecordResponse command documents the EventType as an enum8.
However the spec does not define the EventTypeEnum, which could be easily added to the spec as the Event Type is a textual description.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

App cluster XMLs should use original type definitions instead of BITMAP* directly
5 participants