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 some cluster_id constants to match cluster name #23471

Merged
merged 5 commits into from
Nov 4, 2022
Merged

Rename some cluster_id constants to match cluster name #23471

merged 5 commits into from
Nov 4, 2022

Conversation

andy31415
Copy link
Contributor

this renames CONTENT_LAUNCH to CONTENT_LAUNCHER and ON_OFF_SWITCH_CONFIG to ON_OFF_SWITCH_CONFIGURATION

This makes the cluster name consistent with the constant - it mostly is, except these few clusters.

@andy31415
Update constant for CONTENT_LAUNCH to CONTENT_LAUNCER
4c9f141 
This makes the constant in sync with the cluster name.
Spec 6.7 names this 'Content Launcher Cluster' not 'Content Launch'.

This will simplify codegen because by knowing cluster name, one can
inver cluster constant names.
@andy31415
zap regen
fb0a92b
@andy31415
Rename on off switch config to configuration in cluster constants
a0b292c
@andy31415
Restyle
985186d
@andy31415
zap regen
e67fba6
@github-actions
Copy link

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

PR #23471: Size comparison from 5a0e3ce to e67fba6

Increases (13 builds for bl602, bl702, psoc6, qpg, telink)
platform target config section 5a0e3ce e67fba6 change % change
bl602 lighting-app bl602 (read/write) 1390790 1390798 8 0.0
.text 1070024 1070026 2 0.0
bl602+rpc .text 1101630 1101632 2 0.0
bl702 lighting-app bl702 .debug_info 38070211 38070212 1 0.0
.debug_str 3451743 3451752 9 0.0
.text 957996 957998 2 0.0
bl702+rpc .debug_info 41986318 41986320 2 0.0
.debug_str 3847871 3847880 9 0.0
.text 1031702 1031706 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_str 3435501 3435510 9 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_str 3424530 3424539 9 0.0
light cy8ckit_062s2_43012 .debug_str 3229957 3229966 9 0.0
lock cy8ckit_062s2_43012 .debug_str 3249428 3249437 9 0.0
qpg lock-app qpg6105+debug (read/write) 1114752 1114760 8 0.0
.text 561848 561856 8 0.0
telink all-clusters-app tlsr9518adk80d text 648768 648770 2 0.0
all-clusters-minimal-app tlsr9518adk80d text 612606 612608 2 0.0
light-switch-app tlsr9518adk80d text 554266 554268 2 0.0
lighting-app tlsr9518adk80d text 624254 624256 2 0.0
Decreases (1 build for psoc6)
platform target config section 5a0e3ce e67fba6 change % change
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 27006270 27006269 -1 -0.0
Full report (35 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, k32w, linux, psoc6, qpg, telink)
platform target config section 5a0e3ce e67fba6 change % change
bl602 lighting-app bl602 (read/write) 1390790 1390798 8 0.0
.bss 90745 90745 0 0.0
.data 9936 9936 0 0.0
.text 1070024 1070026 2 0.0
bl602+rpc (read/write) 1436254 1436254 0 0.0
.bss 98177 98177 0 0.0
.data 10320 10320 0 0.0
.text 1101630 1101632 2 0.0
bl702 lighting-app bl702 0 0 0 0.0
(read only) 3262 3262 0 0.0
(read/write) 1189595 1189595 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67134 67134 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1513310 1513310 0 0.0
.debug_aranges 132072 132072 0 0.0
.debug_frame 484468 484468 0 0.0
.debug_info 38070211 38070212 1 0.0
.debug_line 5263909 5263909 0 0.0
.debug_loc 3366772 3366772 0 0.0
.debug_ranges 358128 358128 0 0.0
.debug_str 3451743 3451752 9 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 116680 116680 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 566021 566021 0 0.0
.symtab 172000 172000 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 957996 957998 2 0.0
bl702+rpc 0 0 0 0.0
(read only) 3262 3262 0 0.0
(read/write) 1285539 1285539 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75166 75166 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4816 4816 0 0.0
.debug_abbrev 1650724 1650724 0 0.0
.debug_aranges 139576 139576 0 0.0
.debug_frame 509840 509840 0 0.0
.debug_info 41986318 41986320 2 0.0
.debug_line 5639643 5639643 0 0.0
.debug_loc 3559599 3559599 0 0.0
.debug_ranges 380928 380928 0 0.0
.debug_str 3847871 3847880 9 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 130088 130088 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 625194 625194 0 0.0
.symtab 189808 189808 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 1031702 1031706 4 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 678115 678115 0 0.0
(read/write) 173444 173444 0 0.0
.bss 81252 81252 0 0.0
.data 3380 3380 0 0.0
.rodata 89947 89947 0 0.0
.text 587856 587856 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 642363 642363 0 0.0
(read/write) 158020 158020 0 0.0
.bss 80524 80524 0 0.0
.data 3380 3380 0 0.0
.rodata 79083 79083 0 0.0
.text 562960 562960 0 0.0
lock-ftd LP_CC2652R7 (read only) 676599 676599 0 0.0
(read/write) 172096 172096 0 0.0
.bss 78476 78476 0 0.0
.data 3304 3304 0 0.0
.rodata 77471 77471 0 0.0
.text 598648 598648 0 0.0
lock-mtd LP_CC2652R7 (read only) 660387 660387 0 0.0
(read/write) 183996 183996 0 0.0
.bss 74164 74164 0 0.0
.data 3304 3304 0 0.0
.rodata 103323 103323 0 0.0
.text 556584 556584 0 0.0
pump-app LP_CC2652R7 (read only) 688855 688855 0 0.0
(read/write) 160576 160576 0 0.0
.bss 78444 78444 0 0.0
.data 3296 3296 0 0.0
.rodata 90919 90919 0 0.0
.text 597452 597452 0 0.0
pump-controller-app LP_CC2652R7 (read only) 673131 673131 0 0.0
(read/write) 176396 176396 0 0.0
.bss 78540 78540 0 0.0
.data 3292 3292 0 0.0
.rodata 86467 86467 0 0.0
.text 586184 586184 0 0.0
shell LP_CC2652R7 (read only) 669150 669150 0 0.0
(read/write) 184728 184728 0 0.0
.bss 83572 83572 0 0.0
.data 3376 3376 0 0.0
.rodata 86654 86654 0 0.0
.text 582180 582180 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 588542 588542 0 0.0
.app_xip_area 465128 465128 0 0.0
.bss 65832 65832 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592590 592590 0 0.0
.app_xip_area 463880 463880 0 0.0
.bss 71120 71120 0 0.0
.data 768 768 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 544482 544482 0 0.0
.app_xip_area 426148 426148 0 0.0
.bss 60800 60800 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rpc (read/write) 974732 974732 0 0.0
.bss 152276 152276 0 0.0
.data 2248 2248 0 0.0
.text 820188 820188 0 0.0
BRD4161A+rs911x (read/write) 1034912 1034912 0 0.0
.bss 186744 186744 0 0.0
.data 2092 2092 0 0.0
.text 846052 846052 0 0.0
BRD4187C (read/write) 1146720 1146720 0 0.0
.bss 138664 138664 0 0.0
.data 2596 2596 0 0.0
.text 980864 980864 0 0.0
lock-app BRD4161A+wf200 (read/write) 1160632 1160632 0 0.0
.bss 158272 158272 0 0.0
.data 2100 2100 0 0.0
.text 1000236 1000236 0 0.0
window-app BRD4187C (read/write) 1139940 1139940 0 0.0
.bss 140080 140080 0 0.0
.data 2620 2620 0 0.0
.text 972644 972644 0 0.0
k32w contact k32w0+release (read/write) 661676 661676 0 0.0
.bss 77040 77040 0 0.0
.data 2104 2104 0 0.0
.text 563420 563420 0 0.0
light k32w0+release (read/write) 672008 672008 0 0.0
.bss 74840 74840 0 0.0
.data 2060 2060 0 0.0
.text 592380 592380 0 0.0
lock k32w0+release (read/write) 633484 633484 0 0.0
.bss 75600 75600 0 0.0
.data 2080 2080 0 0.0
.text 553076 553076 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10436348 10436348 0 0.0
(read/write) 706465 706465 0 0.0
.bss 33953 33953 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 650720 650720 0 0.0
.dynamic 560 560 0 0.0
.got 13928 13928 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 518220 518220 0 0.0
.text 8262292 8262292 0 0.0
thermostat-no-ble arm64 (read only) 2392860 2392860 0 0.0
(read/write) 143665 143665 0 0.0
.bss 55377 55377 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77280 77280 0 0.0
.dynamic 560 560 0 0.0
.got 5184 5184 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 144548 144548 0 0.0
.text 2005312 2005312 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 0 0 0 0.0
(read only) 841952 841952 0 0.0
(read/write) 1746196 1746196 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188728 188728 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 1234911 1234911 0 0.0
.debug_aranges 110744 110744 0 0.0
.debug_frame 371236 371236 0 0.0
.debug_info 27006270 27006269 -1 -0.0
.debug_line 3680081 3680081 0 0.0
.debug_loc 3589721 3589721 0 0.0
.debug_ranges 338104 338104 0 0.0
.debug_str 3435501 3435510 9 0.0
.heap 841952 841952 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 570527 570527 0 0.0
.symtab 421792 421792 0 0.0
.text 1546416 1546416 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 0 0 0 0.0
(read only) 842688 842688 0 0.0
(read/write) 1688804 1688804 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187992 187992 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 1226754 1226754 0 0.0
.debug_aranges 110216 110216 0 0.0
.debug_frame 374316 374316 0 0.0
.debug_info 26742899 26742899 0 0.0
.debug_line 3701057 3701057 0 0.0
.debug_loc 3577358 3577358 0 0.0
.debug_ranges 336720 336720 0 0.0
.debug_str 3424530 3424539 9 0.0
.heap 842688 842688 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 534616 534616 0 0.0
.symtab 408224 408224 0 0.0
.text 1489760 1489760 0 0.0
.zero.table 8 8 0 0.0
light cy8ckit_062s2_43012 0 0 0 0.0
(read only) 850872 850872 0 0.0
(read/write) 1607260 1607260 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180016 180016 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 1061215 1061215 0 0.0
.debug_aranges 102416 102416 0 0.0
.debug_frame 344632 344632 0 0.0
.debug_info 22204251 22204251 0 0.0
.debug_line 3270315 3270315 0 0.0
.debug_loc 3275084 3275084 0 0.0
.debug_ranges 302016 302016 0 0.0
.debug_str 3229957 3229966 9 0.0
.heap 850872 850872 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 470941 470941 0 0.0
.symtab 376608 376608 0 0.0
.text 1416400 1416400 0 0.0
.zero.table 8 8 0 0.0
lock cy8ckit_062s2_43012 0 0 0 0.0
(read only) 845880 845880 0 0.0
(read/write) 1641036 1641036 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184992 184992 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 1063190 1063190 0 0.0
.debug_aranges 102816 102816 0 0.0
.debug_frame 346504 346504 0 0.0
.debug_info 22437627 22437627 0 0.0
.debug_line 3267213 3267213 0 0.0
.debug_loc 3302678 3302678 0 0.0
.debug_ranges 303960 303960 0 0.0
.debug_str 3249428 3249437 9 0.0
.heap 845880 845880 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 473344 473344 0 0.0
.symtab 378288 378288 0 0.0
.text 1445184 1445184 0 0.0
.zero.table 8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1149968 1149968 0 0.0
.bss 110612 110612 0 0.0
.data 848 848 0 0.0
.text 597068 597068 0 0.0
lock-app qpg6105+debug (read/write) 1114752 1114760 8 0.0
.bss 106388 106388 0 0.0
.data 836 836 0 0.0
.text 561848 561856 8 0.0
telink all-clusters-app tlsr9518adk80d (read/write) 937348 937348 0 0.0
bss 81632 81632 0 0.0
noinit 43440 43440 0 0.0
text 648768 648770 2 0.0
all-clusters-minimal-app tlsr9518adk80d (read/write) 875156 875156 0 0.0
bss 80856 80856 0 0.0
noinit 43440 43440 0 0.0
text 612606 612608 2 0.0
light-switch-app tlsr9518adk80d (read/write) 790820 790820 0 0.0
bss 72480 72480 0 0.0
noinit 43520 43520 0 0.0
text 554266 554268 2 0.0
lighting-app tlsr9518adk80d (read/write) 875052 875052 0 0.0
bss 82248 82248 0 0.0
noinit 43520 43520 0 0.0
text 624254 624256 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 804952 804952 0 0.0
bss 74052 74052 0 0.0
noinit 43520 43520 0 0.0
text 565286 565286 0 0.0

bzbarsky-apple
bzbarsky-apple approved these changes Nov 3, 2022
View reviewed changes
Copy link
Contributor

@bzbarsky-apple bzbarsky-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is OK as far as it goes, but we should really not have the *_CLUSTER_ID constants at all: SDK consumers should be using the namespaced cluster constants. These things are legacy that we just didn't get around to removing before 1.0....

@andy31415 andy31415 merged commit 63a4f27 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 some cluster_id constants to match cluster name (project-chip#…
e094b40 
…23471)

* Update constant for CONTENT_LAUNCH to CONTENT_LAUNCER

This makes the constant in sync with the cluster name.
Spec 6.7 names this 'Content Launcher Cluster' not 'Content Launch'.

This will simplify codegen because by knowing cluster name, one can
inver cluster constant names.

* zap regen

* Rename on off switch config to configuration in cluster constants

* Restyle

* zap regen
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
@andy31415 @adbridge
Rename some cluster_id constants to match cluster name (project-chip#…
c6805da 
…23471)

* Update constant for CONTENT_LAUNCH to CONTENT_LAUNCER

This makes the constant in sync with the cluster name.
Spec 6.7 names this 'Content Launcher Cluster' not 'Content Launch'.

This will simplify codegen because by knowing cluster name, one can
inver cluster constant names.

* zap regen

* Rename on off switch config to configuration in cluster constants

* Restyle

* zap regen
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

@yufengwangca yufengwangca yufengwangca approved these changes

@selissia selissia selissia approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple 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

@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

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@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

@rgoliver rgoliver Awaiting requested review from rgoliver

@saurabhst saurabhst Awaiting requested review from saurabhst

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@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

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.
6 participants
@andy31415 @tcarmelveilleux @yufengwangca @selissia @bzbarsky-apple @Damian-Nordic