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

Remove KeypadLockout, TemperatureDisplayMode weak enums #25149

Conversation

vivien-apple
Copy link
Contributor

This PR removes KeypadLockout and TemperatureDisplayMode from the weak enums list.

What is interesting about those is that they are "draft" types, i.e they do not carry a cluster code. As such removing them from the allowed list of weak enums makes them unavailable.

I have redefined them as enum class directly in thermostat-user-interface-configuration-server.cpp since everything is self-contained there.

@github-actions
Copy link

PR #25149: Size comparison from 9913fc8 to c0830a4

Increases (1 build for cc32xx)
platform target config section 9913fc8 c0830a4 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20327107 20327109 2 0.0
.debug_line 2657881 2657883 2 0.0
.debug_loc 2790854 2790867 13 0.0
Full report (2 builds for cc32xx, mbed)
platform target config section 9913fc8 c0830a4 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 641857 641857 0 0.0
(read/write) 204124 204124 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197528 197528 0 0.0
.comment 194 194 0 0.0
.data 1476 1476 0 0.0
.debug_abbrev 930005 930005 0 0.0
.debug_aranges 87416 87416 0 0.0
.debug_frame 300116 300116 0 0.0
.debug_info 20327107 20327109 2 0.0
.debug_line 2657881 2657883 2 0.0
.debug_loc 2790854 2790867 13 0.0
.debug_ranges 281552 281552 0 0.0
.debug_str 3010599 3010599 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105697 105697 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 376514 376514 0 0.0
.symtab 256016 256016 0 0.0
.text 534036 534036 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2467864 2467864 0 0.0
.bss 215924 215924 0 0.0
.data 5880 5880 0 0.0
.text 1430508 1430508 0 0.0

@vivien-apple vivien-apple force-pushed the RemoveWeakEnum_KeypadLockoutTemperatureDisplayMode branch from c0830a4 to 6d45309 Compare February 17, 2023 18:34
@bzbarsky-apple bzbarsky-apple enabled auto-merge (squash) February 17, 2023 18:40
@github-actions
Copy link

PR #25149: Size comparison from 0edb83a to 6d45309

Increases (11 builds for bl702, cc13x2_26x2, psoc6, qpg, telink)
platform target config section 0edb83a 6d45309 change % change
bl702 lighting-app bl702 .debug_loc 3417979 3417981 2 0.0
bl702+rpc .debug_loc 3614933 3614935 2 0.0
cc13x2_26x2 pump-app LP_CC2652R7 (read/write) 159796 159804 8 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_abbrev 1257349 1257355 6 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_abbrev 1242894 1242900 6 0.0
light cy8ckit_062s2_43012 .debug_loc 3351788 3351805 17 0.0
lock cy8ckit_062s2_43012 .debug_loc 3376720 3376737 17 0.0
qpg lighting-app qpg6105+debug (read/write) 1150644 1150652 8 0.0
.text 597740 597748 8 0.0
telink contact-sensor-app tlsr9518adk80d (read/write) 855948 855956 8 0.0
text 578908 578910 2 0.0
light-switch-app tlsr9518adk80d text 592914 592916 2 0.0
lighting-app tlsr9518adk80d (read/write) 949736 949744 8 0.0
text 658996 658998 2 0.0
Decreases (8 builds for bl702, cc13x2_26x2, cc32xx, nrfconnect, psoc6)
platform target config section 0edb83a 6d45309 change % change
bl702 lighting-app bl702 .debug_info 40702887 40702886 -1 -0.0
.text 954746 954744 -2 -0.0
bl702+rpc .debug_info 45118314 45118312 -2 -0.0
.text 1032156 1032152 -4 -0.0
cc13x2_26x2 pump-app LP_CC2652R7 (read only) 689387 689379 -8 -0.0
.text 597976 597968 -8 -0.0
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20361460 20361459 -1 -0.0
.debug_line 2661258 2661254 -4 -0.0
.debug_loc 2797585 2797481 -104 -0.0
nrfconnect all-clusters-minimal-app nrf52840dk_nrf52840 text 775836 775832 -4 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 28076450 28076136 -314 -0.0
.debug_line 3796417 3795627 -790 -0.0
.debug_loc 3692918 3692905 -13 -0.0
.debug_str 3529517 3529260 -257 -0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 27622543 27622229 -314 -0.0
.debug_line 3804924 3804110 -814 -0.0
.debug_loc 3676345 3676331 -14 -0.0
.debug_str 3516780 3516523 -257 -0.0
light cy8ckit_062s2_43012 .debug_info 22965337 22965336 -1 -0.0
Full report (41 builds for bl602, bl702, cc13x2_26x2, cc32xx, cyw30739, efr32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 0edb83a 6d45309 change % change
bl602 lighting-app bl602 (read/write) 1348762 1348762 0 0.0
.bss 94690 94690 0 0.0
.data 9736 9736 0 0.0
.text 1025144 1025144 0 0.0
bl602+rpc (read/write) 1394186 1394186 0 0.0
.bss 102738 102738 0 0.0
.data 10128 10128 0 0.0
.text 1056078 1056078 0 0.0
bl702 lighting-app bl702 0 0 0 0.0
(read only) 3358 3358 0 0.0
(read/write) 1187331 1187331 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 69793 69793 0 0.0
.bss_psram 30064 30064 0 0.0
.comment 48 48 0 0.0
.data 4064 4064 0 0.0
.debug_abbrev 1556113 1556113 0 0.0
.debug_aranges 134400 134400 0 0.0
.debug_frame 492608 492608 0 0.0
.debug_info 40702887 40702886 -1 -0.0
.debug_line 5284354 5284354 0 0.0
.debug_loc 3417979 3417981 2 0.0
.debug_ranges 372096 372096 0 0.0
.debug_str 3576735 3576735 0 0.0
.hbn 536 536 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 107568 107568 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 573628 573628 0 0.0
.symtab 173504 173504 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 954746 954744 -2 -0.0
bl702+rpc 0 0 0 0.0
(read only) 3358 3358 0 0.0
(read/write) 1280479 1280479 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 77841 77841 0 0.0
.bss_psram 30320 30320 0 0.0
.comment 48 48 0 0.0
.data 4608 4608 0 0.0
.debug_abbrev 1704359 1704359 0 0.0
.debug_aranges 142640 142640 0 0.0
.debug_frame 520372 520372 0 0.0
.debug_info 45118314 45118312 -2 -0.0
.debug_line 5683397 5683397 0 0.0
.debug_loc 3614933 3614935 2 0.0
.debug_ranges 395872 395872 0 0.0
.debug_str 3980272 3980272 0 0.0
.hbn 536 536 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 122208 122208 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 634692 634692 0 0.0
.symtab 191968 191968 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 1032156 1032152 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 679943 679943 0 0.0
(read/write) 171152 171152 0 0.0
.bss 80788 80788 0 0.0
.data 3388 3388 0 0.0
.rodata 88319 88319 0 0.0
.text 591308 591308 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 643279 643279 0 0.0
(read/write) 157500 157500 0 0.0
.bss 79996 79996 0 0.0
.data 3388 3388 0 0.0
.rodata 78231 78231 0 0.0
.text 564728 564728 0 0.0
lock-ftd LP_CC2652R7 (read only) 676447 676447 0 0.0
(read/write) 172016 172016 0 0.0
.bss 78244 78244 0 0.0
.data 3316 3316 0 0.0
.rodata 76679 76679 0 0.0
.text 599288 599288 0 0.0
lock-mtd LP_CC2652R7 (read only) 662947 662947 0 0.0
(read/write) 180772 180772 0 0.0
.bss 73500 73500 0 0.0
.data 3316 3316 0 0.0
.rodata 103299 103299 0 0.0
.text 559168 559168 0 0.0
pump-app LP_CC2652R7 (read only) 689387 689379 -8 -0.0
(read/write) 159796 159804 8 0.0
.bss 78196 78196 0 0.0
.data 3280 3280 0 0.0
.rodata 90931 90931 0 0.0
.text 597976 597968 -8 -0.0
pump-controller-app LP_CC2652R7 (read only) 674571 674571 0 0.0
(read/write) 174740 174740 0 0.0
.bss 78324 78324 0 0.0
.data 3304 3304 0 0.0
.rodata 86931 86931 0 0.0
.text 587160 587160 0 0.0
shell LP_CC2652R7 (read only) 671214 671214 0 0.0
(read/write) 181952 181952 0 0.0
.bss 82860 82860 0 0.0
.data 3384 3384 0 0.0
.rodata 85070 85070 0 0.0
.text 585832 585832 0 0.0
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 642217 642217 0 0.0
(read/write) 203696 203696 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197096 197096 0 0.0
.comment 194 194 0 0.0
.data 1480 1480 0 0.0
.debug_abbrev 934242 934242 0 0.0
.debug_aranges 87472 87472 0 0.0
.debug_frame 300288 300288 0 0.0
.debug_info 20361460 20361459 -1 -0.0
.debug_line 2661258 2661254 -4 -0.0
.debug_loc 2797585 2797481 -104 -0.0
.debug_ranges 281768 281768 0 0.0
.debug_str 3020435 3020435 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105705 105705 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 377379 377379 0 0.0
.symtab 256048 256048 0 0.0
.text 534392 534392 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 585994 585994 0 0.0
.app_xip_area 462868 462868 0 0.0
.bss 65568 65568 0 0.0
.data 740 740 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 590058 590058 0 0.0
.app_xip_area 461628 461628 0 0.0
.bss 70864 70864 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 550982 550982 0 0.0
.app_xip_area 433360 433360 0 0.0
.bss 60104 60104 0 0.0
.data 696 696 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rs9116 (read/write) 1040592 1040592 0 0.0
.bss 181500 181500 0 0.0
.data 2048 2048 0 0.0
.text 857024 857024 0 0.0
lock-app BRD4161A+wf200 (read/write) 1067600 1067600 0 0.0
.bss 153028 153028 0 0.0
.data 2056 2056 0 0.0
.text 912496 912496 0 0.0
lighting-app BRD4187C (read/write) 1137416 1137416 0 0.0
.bss 133184 133184 0 0.0
.data 2536 2536 0 0.0
.text 977100 977100 0 0.0
window-app BRD4187C (read/write) 1138400 1138400 0 0.0
.bss 134768 134768 0 0.0
.data 2576 2576 0 0.0
.text 976460 976460 0 0.0
k32w contact k32w0+release (read/write) 669864 669864 0 0.0
.bss 77548 77548 0 0.0
.data 2204 2204 0 0.0
.text 571000 571000 0 0.0
light k32w0+release (read/write) 668884 668884 0 0.0
.bss 77252 77252 0 0.0
.data 2192 2192 0 0.0
.text 570328 570328 0 0.0
lock k32w0+release (read/write) 625720 625720 0 0.0
.bss 75388 75388 0 0.0
.data 2136 2136 0 0.0
.text 545468 545468 0 0.0
linux chip-tool-ipv6only arm64 (read only) 12052756 12052756 0 0.0
(read/write) 729224 729224 0 0.0
.bss 34136 34136 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 671552 671552 0 0.0
.dynamic 560 560 0 0.0
.got 15328 15328 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 585396 585396 0 0.0
.text 9736804 9736804 0 0.0
thermostat-no-ble arm64 (read only) 2516220 2516220 0 0.0
(read/write) 145096 145096 0 0.0
.bss 56312 56312 0 0.0
.data 1832 1832 0 0.0
.data.rel.ro 77568 77568 0 0.0
.dynamic 560 560 0 0.0
.got 5336 5336 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 151320 151320 0 0.0
.text 2102752 2102752 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2466544 2466544 0 0.0
.bss 215812 215812 0 0.0
.data 5880 5880 0 0.0
.text 1429188 1429188 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1164212 1164212 0 0.0
bss 143451 143451 0 0.0
rodata 134416 134416 0 0.0
text 806504 806504 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1109776 1109776 0 0.0
bss 142607 142607 0 0.0
rodata 111484 111484 0 0.0
text 775836 775832 -4 -0.0
all-clusters-app nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1369588 1369588 0 0.0
bss 105914 105914 0 0.0
rodata 211856 211856 0 0.0
text 766280 766280 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 0 0 0 0.0
(read only) 840952 840952 0 0.0
(read/write) 1760324 1760324 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 189720 189720 0 0.0
.comment 200 200 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 2672 2672 0 0.0
.debug_abbrev 1257349 1257355 6 0.0
.debug_aranges 111520 111520 0 0.0
.debug_frame 374684 374684 0 0.0
.debug_info 28076450 28076136 -314 -0.0
.debug_line 3796417 3795627 -790 -0.0
.debug_loc 3692918 3692905 -13 -0.0
.debug_ranges 363488 363488 0 0.0
.debug_str 3529517 3529260 -257 -0.0
.heap 840952 840952 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 580440 580440 0 0.0
.symtab 425184 425184 0 0.0
.text 1559544 1559544 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 0 0 0 0.0
(read only) 841752 841752 0 0.0
(read/write) 1700836 1700836 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188920 188920 0 0.0
.comment 200 200 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 2672 2672 0 0.0
.debug_abbrev 1242894 1242900 6 0.0
.debug_aranges 110784 110784 0 0.0
.debug_frame 377120 377120 0 0.0
.debug_info 27622543 27622229 -314 -0.0
.debug_line 3804924 3804110 -814 -0.0
.debug_loc 3676345 3676331 -14 -0.0
.debug_ranges 361456 361456 0 0.0
.debug_str 3516780 3516523 -257 -0.0
.heap 841752 841752 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 539857 539857 0 0.0
.symtab 410192 410192 0 0.0
.text 1500856 1500856 0 0.0
.zero.table 8 8 0 0.0
light cy8ckit_062s2_43012 0 0 0 0.0
(read only) 850072 850072 0 0.0
(read/write) 1614388 1614388 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180808 180808 0 0.0
.comment 200 200 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 2464 2464 0 0.0
.debug_abbrev 1078288 1078288 0 0.0
.debug_aranges 102984 102984 0 0.0
.debug_frame 347372 347372 0 0.0
.debug_info 22965337 22965336 -1 -0.0
.debug_line 3356743 3356743 0 0.0
.debug_loc 3351788 3351805 17 0.0
.debug_ranges 319968 319968 0 0.0
.debug_str 3315269 3315269 0 0.0
.heap 850072 850072 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 475580 475580 0 0.0
.symtab 378032 378032 0 0.0
.text 1422728 1422728 0 0.0
.zero.table 8 8 0 0.0
lock cy8ckit_062s2_43012 0 0 0 0.0
(read only) 845088 845088 0 0.0
(read/write) 1648508 1648508 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185776 185776 0 0.0
.comment 200 200 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 2480 2480 0 0.0
.debug_abbrev 1080317 1080317 0 0.0
.debug_aranges 103432 103432 0 0.0
.debug_frame 349276 349276 0 0.0
.debug_info 23218355 23218355 0 0.0
.debug_line 3359180 3359180 0 0.0
.debug_loc 3376720 3376737 17 0.0
.debug_ranges 322568 322568 0 0.0
.debug_str 3334400 3334400 0 0.0
.heap 845088 845088 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 479595 479595 0 0.0
.symtab 380496 380496 0 0.0
.text 1451864 1451864 0 0.0
.zero.table 8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1150644 1150652 8 0.0
.bss 99820 99820 0 0.0
.data 852 852 0 0.0
.text 597740 597748 8 0.0
lock-app qpg6105+debug (read/write) 1118204 1118204 0 0.0
.bss 96316 96316 0 0.0
.data 864 864 0 0.0
.text 565304 565304 0 0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1015740 1015740 0 0.0
bss 97788 97788 0 0.0
text 686860 686860 0 0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 951424 951424 0 0.0
bss 96840 96840 0 0.0
text 648366 648366 0 0.0
contact-sensor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 855948 855956 8 0.0
bss 88968 88968 0 0.0
text 578908 578910 2 0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 871668 871668 0 0.0
bss 89052 89052 0 0.0
text 592914 592916 2 0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 949736 949744 8 0.0
bss 97196 97196 0 0.0
text 658996 658998 2 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 883084 883084 0 0.0
bss 89996 89996 0 0.0
text 602738 602738 0 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 875760 875760 0 0.0
bss 90444 90444 0 0.0
text 594326 594326 0 0.0

@bzbarsky-apple bzbarsky-apple merged commit d4ddcaa into project-chip:master Feb 17, 2023
lecndav pushed a commit to lecndav/connectedhomeip that referenced this pull request Mar 22, 2023
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.

3 participants