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

Rename OTA defines to be in line with cluster naming #23503

Merged
merged 4 commits into from
Nov 4, 2022
Merged

Rename OTA defines to be in line with cluster naming #23503

merged 4 commits into from
Nov 4, 2022

Conversation

andy31415
Copy link
Contributor

@andy31415 andy31415 commented Nov 4, 2022 •
edited
Loading

Renames OTA_PROVIDER_CLUSTER to OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER (name based on 11.19.6 in the spec) and OTA_REQUESTOR_CLUSTER to OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER (name based on 11.19.7 in the spec).

This makes the constant definitions be in line with the cluster naming and the spec, allowing for more simplified codegen and autocomplete in the future (defines are trivially based on cluster names and they do not diverge).

@github-actions
Copy link

github-actions bot commented Nov 4, 2022 •
edited
Loading

PR #23503: Size comparison from 0e41b19 to 0e317c9

Increases (12 builds for bl702, esp32, nrfconnect, psoc6, qpg, telink)
platform target config section 0e41b19 0e317c9 change % change
bl702 lighting-app bl702 .debug_str 3447381 3447413 32 0.0
bl702+rpc .debug_str 3843531 3843563 32 0.0
esp32 all-clusters-app c3devkit (read only) 1224238 1224242 4 0.0
.flash.text 1224238 1224242 4 0.0
nrfconnect all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1167107 1167123 16 0.0
text 805446 805450 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_str 3431092 3431124 32 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26759872 26759873 1 0.0
.debug_str 3420112 3420144 32 0.0
light cy8ckit_062s2_43012 .debug_info 22225320 22225322 2 0.0
.debug_str 3225547 3225579 32 0.0
lock cy8ckit_062s2_43012 .debug_str 3245018 3245050 32 0.0
qpg lighting-app qpg6105+debug (read/write) 1149552 1149560 8 0.0
.text 596652 596660 8 0.0
telink light-switch-app tlsr9518adk80d text 554102 554104 2 0.0
lighting-app tlsr9518adk80d text 624080 624082 2 0.0
ota-requestor-app tlsr9518adk80d text 565482 565484 2 0.0
Decreases (5 builds for bl602, bl702, nrfconnect, psoc6, telink)
platform target config section 0e41b19 0e317c9 change % change
bl602 lighting-app bl602+rpc (read/write) 1434438 1434430 -8 -0.0
.text 1100362 1100360 -2 -0.0
bl702 lighting-app bl702 (read/write) 1188147 1188131 -16 -0.0
.debug_info 38073515 38073513 -2 -0.0
.text 957076 957072 -4 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 816960 816956 -4 -0.0
psoc6 lock cy8ckit_062s2_43012 .debug_info 22458699 22458697 -2 -0.0
telink all-clusters-app tlsr9518adk80d (read/write) 936772 936764 -8 -0.0
text 648606 648604 -2 -0.0
Full report (40 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 0e41b19 0e317c9 change % change
bl602 lighting-app bl602 (read/write) 1388982 1388982 0 0.0
.bss 90729 90729 0 0.0
.data 9936 9936 0 0.0
.text 1068758 1068758 0 0.0
bl602+rpc (read/write) 1434438 1434430 -8 -0.0
.bss 98161 98161 0 0.0
.data 10320 10320 0 0.0
.text 1100362 1100360 -2 -0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188147 1188131 -16 -0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67126 67126 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1514398 1514398 0 0.0
.debug_aranges 132032 132032 0 0.0
.debug_frame 484600 484600 0 0.0
.debug_info 38073515 38073513 -2 -0.0
.debug_line 5270877 5270877 0 0.0
.debug_loc 3373225 3373225 0 0.0
.debug_ranges 359712 359712 0 0.0
.debug_str 3447381 3447413 32 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 116152 116152 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 565780 565780 0 0.0
.symtab 171984 171984 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
957076 957072 -4 -0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284075 1284075 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75158 75158 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4816 4816 0 0.0
.debug_abbrev 1651814 1651814 0 0.0
.debug_aranges 139536 139536 0 0.0
.debug_frame 509972 509972 0 0.0
.debug_info 41990718 41990718 0 0.0
.debug_line 5647024 5647024 0 0.0
.debug_loc 3566009 3566009 0 0.0
.debug_ranges 382512 382512 0 0.0
.debug_str 3843531 3843563 32 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 129560 129560 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624953 624953 0 0.0
.symtab 189792 189792 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030778 1030778 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 677387 677387 0 0.0
(read/write) 174156 174156 0 0.0
.bss 81236 81236 0 0.0
.data 3380 3380 0 0.0
.rodata 89547 89547 0 0.0
.text 587528 587528 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 641635 641635 0 0.0
(read/write) 158004 158004 0 0.0
.bss 80508 80508 0 0.0
.data 3380 3380 0 0.0
.rodata 78683 78683 0 0.0
.text 562632 562632 0 0.0
lock-ftd LP_CC2652R7 (read only) 676151 676151 0 0.0
(read/write) 172528 172528 0 0.0
.bss 78460 78460 0 0.0
.data 3304 3304 0 0.0
.rodata 77071 77071 0 0.0
.text 598600 598600 0 0.0
lock-mtd LP_CC2652R7 (read only) 659939 659939 0 0.0
(read/write) 184428 184428 0 0.0
.bss 74148 74148 0 0.0
.data 3304 3304 0 0.0
.rodata 102923 102923 0 0.0
.text 556536 556536 0 0.0
pump-app LP_CC2652R7 (read only) 688599 688599 0 0.0
(read/write) 160816 160816 0 0.0
.bss 78428 78428 0 0.0
.data 3296 3296 0 0.0
.rodata 90559 90559 0 0.0
.text 597556 597556 0 0.0
pump-controller-app LP_CC2652R7 (read only) 672899 672899 0 0.0
(read/write) 176612 176612 0 0.0
.bss 78524 78524 0 0.0
.data 3292 3292 0 0.0
.rodata 86107 86107 0 0.0
.text 586312 586312 0 0.0
shell LP_CC2652R7 (read only) 668606 668606 0 0.0
(read/write) 185256 185256 0 0.0
.bss 83556 83556 0 0.0
.data 3376 3376 0 0.0
.rodata 86294 86294 0 0.0
.text 581996 581996 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586790 586790 0 0.0
.app_xip_area 463432 463432 0 0.0
.bss 65808 65808 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 590838 590838 0 0.0
.app_xip_area 462184 462184 0 0.0
.bss 71096 71096 0 0.0
.data 736 736 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543002 543002 0 0.0
.app_xip_area 424724 424724 0 0.0
.bss 60776 60776 0 0.0
.data 684 684 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rpc (read/write) 974252 974252 0 0.0
.bss 152260 152260 0 0.0
.data 2248 2248 0 0.0
.text 819724 819724 0 0.0
BRD4161A+rs911x (read/write) 1034800 1034800 0 0.0
.bss 186728 186728 0 0.0
.data 2092 2092 0 0.0
.text 845956 845956 0 0.0
BRD4187C (read/write) 1146640 1146640 0 0.0
.bss 138648 138648 0 0.0
.data 2596 2596 0 0.0
.text 980800 980800 0 0.0
lock-app BRD4161A+wf200 (read/write) 1160088 1160088 0 0.0
.bss 158256 158256 0 0.0
.data 2100 2100 0 0.0
.text 999708 999708 0 0.0
window-app BRD4187C (read/write) 1139860 1139860 0 0.0
.bss 140064 140064 0 0.0
.data 2620 2620 0 0.0
.text 972580 972580 0 0.0
esp32 all-clusters-app c3devkit (read only) 1224238 1224242 4 0.0
(read/write) 1788526 1788526 0 0.0
.dram0.bss 76944 76944 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 258096 258096 0 0.0
.flash.text 1224238 1224242 4 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1234123 1234123 0 0.0
(read/write) 564332 564332 0 0.0
.dram0.bss 82320 82320 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 315048 315048 0 0.0
.flash.text 1228739 1228739 0 0.0
.iram0.text 123939 123939 0 0.0
k32w contact k32w0+release (read/write) 661212 661212 0 0.0
.bss 77024 77024 0 0.0
.data 2104 2104 0 0.0
.text 562972 562972 0 0.0
light k32w0+release (read/write) 671256 671256 0 0.0
.bss 74824 74824 0 0.0
.data 2060 2060 0 0.0
.text 591644 591644 0 0.0
lock k32w0+release (read/write) 632732 632732 0 0.0
.bss 75584 75584 0 0.0
.data 2080 2080 0 0.0
.text 552340 552340 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10433500 10433500 0 0.0
(read/write) 706337 706337 0 0.0
.bss 33905 33905 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 650672 650672 0 0.0
.dynamic 560 560 0 0.0
.got 13912 13912 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 518220 518220 0 0.0
.text 8260004 8260004 0 0.0
thermostat-no-ble arm64 (read only) 2391932 2391932 0 0.0
(read/write) 143777 143777 0 0.0
.bss 55393 55393 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77328 77328 0 0.0
.dynamic 560 560 0 0.0
.got 5176 5176 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 144724 144724 0 0.0
.text 2003840 2003840 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2452192 2452192 0 0.0
.bss 215012 215012 0 0.0
.data 5872 5872 0 0.0
.text 1414836 1414836 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1187759 1187759 0 0.0
bss 145285 145285 0 0.0
rodata 144436 144436 0 0.0
text 816960 816956 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1167107 1167123 16 0.0
bss 144512 144512 0 0.0
rodata 136224 136224 0 0.0
text 805446 805450 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841968 841968 0 0.0
(read/write) 1746028 1746028 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188712 188712 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1235716 1235716 0 0.0
.debug_aranges 110704 110704 0 0.0
.debug_frame 371280 371280 0 0.0
.debug_info 27023243 27023243 0 0.0
.debug_line 3685726 3685726 0 0.0
.debug_loc 3603492 3603492 0 0.0
.debug_ranges 339528 339528 0 0.0
.debug_str 3431092 3431124 32 0.0
.heap 841968 841968 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 570286 570286 0 0.0
.symtab 421424 421424 0 0.0
.text 0 0 0 0.0
1546264 1546264 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842704 842704 0 0.0
(read/write) 1688628 1688628 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187976 187976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1227559 1227559 0 0.0
.debug_aranges 110176 110176 0 0.0
.debug_frame 374360 374360 0 0.0
.debug_info 26759872 26759873 1 0.0
.debug_line 3706710 3706710 0 0.0
.debug_loc 3591129 3591129 0 0.0
.debug_ranges 338144 338144 0 0.0
.debug_str 3420112 3420144 32 0.0
.heap 842704 842704 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 534375 534375 0 0.0
.symtab 407856 407856 0 0.0
.text 1489600 1489600 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850888 850888 0 0.0
(read/write) 1606956 1606956 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180000 180000 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1062020 1062020 0 0.0
.debug_aranges 102376 102376 0 0.0
.debug_frame 344676 344676 0 0.0
.debug_info 22225320 22225322 2 0.0
.debug_line 3276052 3276052 0 0.0
.debug_loc 3288873 3288873 0 0.0
.debug_ranges 303440 303440 0 0.0
.debug_str 3225547 3225579 32 0.0
.heap 850888 850888 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 470700 470700 0 0.0
.symtab 376240 376240 0 0.0
.text 1416112 1416112 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845896 845896 0 0.0
(read/write) 1640748 1640748 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184976 184976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1063995 1063995 0 0.0
.debug_aranges 102776 102776 0 0.0
.debug_frame 346548 346548 0 0.0
.debug_info 22458699 22458697 -2 -0.0
.debug_line 3272946 3272946 0 0.0
.debug_loc 3316467 3316467 0 0.0
.debug_ranges 305384 305384 0 0.0
.debug_str 3245018 3245050 32 0.0
.heap 845896 845896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 473103 473103 0 0.0
.symtab 377920 377920 0 0.0
.text 1444912 1444912 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1149552 1149560 8 0.0
.bss 110596 110596 0 0.0
.data 848 848 0 0.0
.text 596652 596660 8 0.0
lock-app qpg6105+debug (read/write) 1114352 1114352 0 0.0
.bss 106372 106372 0 0.0
.data 836 836 0 0.0
.text 561448 561448 0 0.0
telink all-clusters-app tlsr9518adk80d (read/write) 936772 936764 -8 -0.0
bss 81616 81616 0 0.0
noinit 43440 43440 0 0.0
text 648606 648604 -2 -0.0
all-clusters-minimal-app tlsr9518adk80d (read/write) 874748 874748 0 0.0
bss 80840 80840 0 0.0
noinit 43440 43440 0 0.0
text 612574 612574 0 0.0
light-switch-app tlsr9518adk80d (read/write) 790244 790244 0 0.0
bss 72464 72464 0 0.0
noinit 43520 43520 0 0.0
text 554102 554104 2 0.0
lighting-app tlsr9518adk80d (read/write) 874460 874460 0 0.0
bss 82232 82232 0 0.0
noinit 43520 43520 0 0.0
text 624080 624082 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 804736 804736 0 0.0
bss 74036 74036 0 0.0
noinit 43520 43520 0 0.0
text 565482 565484 2 0.0

@andy31415 andy31415 merged commit 0c00923 into project-chip:master Nov 4, 2022
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
@andy31415 @adbridge
Rename OTA defines to be in line with cluster naming (project-chip#23503
0feba99 
)

* Rename OTA_(PROVIDER|REQUESTOR) to OTA_SOFTWARE_UPDATE_(PROVIDER|REQUESTOR)

* Zap regen

* Fix typo: append CLUSTER suffix back to OTA_SOFTWARE_REQUESTOR

* Regen again after missed renaming
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
@andy31415 @adbridge
Rename OTA defines to be in line with cluster naming (project-chip#23503
ef38b29 
)

* Rename OTA_(PROVIDER|REQUESTOR) to OTA_SOFTWARE_UPDATE_(PROVIDER|REQUESTOR)

* Zap regen

* Fix typo: append CLUSTER suffix back to OTA_SOFTWARE_REQUESTOR

* Regen again after missed renaming
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tcarmelveilleux tcarmelveilleux tcarmelveilleux approved these changes

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

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

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

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

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

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

@gjc13 gjc13 Awaiting requested review from gjc13

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

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@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

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

@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

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@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 review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andy31415 @tcarmelveilleux @Damian-Nordic