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

Define the unknown enum value for cluster enums. #20937

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Define the unknown enum value for cluster enums. #20937

merged 1 commit into from
Jul 19, 2022

Conversation

woody-apple
Copy link
Contributor

And fix various bits of code that did not handle unexpected enum
values.

Problem

We don't have a good way, for enum class enums, to test for the "not a known value" case.

Change overview

Add a way.

Testing

No behavior changes except some error handling bits.

@Morozov-5F Could you please review the door lock changes?

@tlykkeberg-grundfos @ReneJosefsen Could you please review the pump changes?

@tcarmelveilleux Could you please review the OTA and diagnostic logs changes?

@bzbarsky-apple @web-flow
Define the unknown enum value for cluster enums. (#20907)
5ca8f9c 
And fix various bits of code that did not handle unexpected enum
values.
@github-actions
Copy link

github-actions bot commented Jul 19, 2022 •
edited
Loading

PR #20937: Size comparison from 66592b6 to 5ca8f9c

Increases (31 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, linux, nrfconnect, p6, telink)
platform target config section 66592b6 5ca8f9c change % change
bl602 lighting-app bl602 (read/write) 1383730 1383746 16 0.0
.text 1053776 1053792 16 0.0
bl602+rpc (read/write) 1429170 1429186 16 0.0
.text 1085464 1085480 16 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668399 668503 104 0.0
.text 579764 579868 104 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634015 634127 112 0.0
.text 556140 556252 112 0.0
lock-ftd LP_CC2652R7 (read only) 671595 671611 16 0.0
.text 594664 594680 16 0.0
lock-mtd LP_CC2652R7 (read only) 653887 653895 8 0.0
.text 552208 552216 8 0.0
pump-app LP_CC2652R7 (read only) 680587 680619 32 0.0
.text 591292 591324 32 0.0
pump-controller-app LP_CC2652R7 (read only) 666379 666395 16 0.0
.text 581224 581240 16 0.0
shell LP_CC2652R7 (read only) 660890 661002 112 0.0
.text 575476 575588 112 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581926 581934 8 0.0
.app_xip_area 460632 460640 8 0.0
lock cyw930739m2evb_01 (read/write) 587842 587850 8 0.0
.app_xip_area 461820 461828 8 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 585266 585274 8 0.0
.app_xip_area 464820 464828 8 0.0
efr32 lighting-app BRD4161A (read/write) 1084792 1084808 16 0.0
.text 949680 949696 16 0.0
BRD4161A+rs911x (read/write) 950160 950176 16 0.0
.text 807324 807340 16 0.0
window-app BRD4161A (read/write) 1078284 1078300 16 0.0
.text 941672 941688 16 0.0
esp32 all-clusters-app c3devkit (read only) 1021762 1021806 44 0.0
.flash.text 1021762 1021806 44 0.0
m5stack (read only) 1075507 1075539 32 0.0
.flash.text 1070123 1070155 32 0.0
linux all-clusters-app debug (read only) 2973161 2973353 192 0.0
.rodata 264733 264797 64 0.0
.text 2530834 2530962 128 0.0
all-clusters-minimal-app debug (read only) 2819721 2819897 176 0.0
.rodata 265661 265725 64 0.0
.text 2379122 2379234 112 0.0
chip-tool debug (read only) 10295393 10295425 32 0.0
.text 8331604 8331636 32 0.0
chip-tool-ipv6only arm64 (read only) 10035964 10035996 32 0.0
.text 7976180 7976212 32 0.0
lock-app debug (read only) 2522617 2522649 32 0.0
.text 2128482 2128514 32 0.0
ota-requestor-app debug (read only) 2443817 2443897 80 0.0
.text 2065154 2065234 80 0.0
shell debug (read only) 2560065 2560241 176 0.0
.rodata 228114 228178 64 0.0
.text 2174946 2175058 112 0.0
tv-app debug (read only) 3108121 3108153 32 0.0
.text 2670818 2670850 32 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176643 1176675 32 0.0
text 812636 812672 36 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156675 1156723 48 0.0
text 801920 801956 36 0.0
p6 all-clusters-app default (read/write) 1685036 1685100 64 0.0
.text 1525440 1525504 64 0.0
all-clusters-minimal-app default (read/write) 1629180 1629212 32 0.0
.text 1470304 1470336 32 0.0
telink light-switch-app tlsr9518adk80d text 566812 566814 2 0.0
lighting-app tlsr9518adk80d text 583346 583348 2 0.0
Decreases (6 builds for cc13x2_26x2)
platform target config section 66592b6 5ca8f9c change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 182840 182736 -104 -0.1
lock-ftd LP_CC2652R7 (read/write) 169820 169804 -16 -0.0
lock-mtd LP_CC2652R7 (read/write) 183216 183208 -8 -0.0
pump-app LP_CC2652R7 (read/write) 161676 161644 -32 -0.0
pump-controller-app LP_CC2652R7 (read/write) 176004 175988 -16 -0.0
shell LP_CC2652R7 (read/write) 185852 185740 -112 -0.1
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 66592b6 5ca8f9c change % change
bl602 lighting-app bl602 (read/write) 1383730 1383746 16 0.0
.bss 116978 116978 0 0.0
.data 4480 4480 0 0.0
.text 1053776 1053792 16 0.0
bl602+rpc (read/write) 1429170 1429186 16 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1085464 1085480 16 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668399 668503 104 0.0
(read/write) 182840 182736 -104 -0.1
.bss 74132 74132 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579764 579868 104 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634015 634127 112 0.0
(read/write) 157700 157700 0 0.0
.bss 73428 73428 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 556140 556252 112 0.0
lock-ftd LP_CC2652R7 (read only) 671595 671611 16 0.0
(read/write) 169820 169804 -16 -0.0
.bss 71196 71196 0 0.0
.data 3280 3280 0 0.0
.rodata 76451 76451 0 0.0
.text 594664 594680 16 0.0
lock-mtd LP_CC2652R7 (read only) 653887 653895 8 0.0
(read/write) 183216 183208 -8 -0.0
.bss 66884 66884 0 0.0
.data 3280 3280 0 0.0
.rodata 101199 101199 0 0.0
.text 552208 552216 8 0.0
pump-app LP_CC2652R7 (read only) 680587 680619 32 0.0
(read/write) 161676 161644 -32 -0.0
.bss 71276 71276 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 591292 591324 32 0.0
pump-controller-app LP_CC2652R7 (read only) 666379 666395 16 0.0
(read/write) 176004 175988 -16 -0.0
.bss 71396 71396 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 581224 581240 16 0.0
shell LP_CC2652R7 (read only) 660890 661002 112 0.0
(read/write) 185852 185740 -112 -0.1
.bss 76436 76436 0 0.0
.data 3360 3360 0 0.0
.rodata 85098 85098 0 0.0
.text 575476 575588 112 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581926 581934 8 0.0
.app_xip_area 460632 460640 8 0.0
.bss 64232 64232 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 587842 587850 8 0.0
.app_xip_area 461820 461828 8 0.0
.bss 68960 68960 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 585266 585274 8 0.0
.app_xip_area 464820 464828 8 0.0
.bss 63440 63440 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1084792 1084808 16 0.0
.bss 133044 133044 0 0.0
.data 2048 2048 0 0.0
.text 949680 949696 16 0.0
BRD4161A+rpc (read/write) 1139132 1139132 0 0.0
.bss 149724 149724 0 0.0
.data 2260 2260 0 0.0
.text 987124 987124 0 0.0
BRD4161A+rs911x (read/write) 950160 950176 16 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 807324 807340 16 0.0
lock-app BRD4161A+wf200 (read/write) 1128004 1128004 0 0.0
.bss 144136 144136 0 0.0
.data 2056 2056 0 0.0
.text 981792 981792 0 0.0
window-app BRD4161A (read/write) 1078284 1078300 16 0.0
.bss 134516 134516 0 0.0
.data 2076 2076 0 0.0
.text 941672 941688 16 0.0
esp32 all-clusters-app c3devkit (read only) 1021762 1021806 44 0.0
(read/write) 1486026 1486026 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215912 215912 0 0.0
.flash.text 1021762 1021806 44 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075507 1075539 32 0.0
(read/write) 488064 488064 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246324 246324 0 0.0
.flash.text 1070123 1070155 32 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660700 660700 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 583368 583368 0 0.0
lock k32w061+release (read/write) 687684 687684 0 0.0
.bss 70004 70004 0 0.0
.data 2004 2004 0 0.0
.text 609876 609876 0 0.0
linux all-clusters-app debug (read only) 2973161 2973353 192 0.0
(read/write) 155016 155016 0 0.0
.bss 61664 61664 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 85048 85048 0 0.0
.dynamic 608 608 0 0.0
.got 4560 4560 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 264733 264797 64 0.0
.text 2530834 2530962 128 0.0
all-clusters-minimal-app debug (read only) 2819721 2819897 176 0.0
(read/write) 146688 146688 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 265661 265725 64 0.0
.text 2379122 2379234 112 0.0
bridge-app debug+rpc (read only) 2320009 2320009 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4384 4384 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 198240 198240 0 0.0
.text 1960130 1960130 0 0.0
chip-tool debug (read only) 10295393 10295425 32 0.0
(read/write) 629504 629504 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 595152 595152 0 0.0
.dynamic 608 608 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 515765 515765 0 0.0
.text 8331604 8331636 32 0.0
chip-tool-ipv6only arm64 (read only) 10035964 10035996 32 0.0
(read/write) 694577 694577 0 0.0
.bss 42961 42961 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 630768 630768 0 0.0
.dynamic 528 528 0 0.0
.got 13624 13624 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 479820 479820 0 0.0
.text 7976180 7976212 32 0.0
lighting-app debug+rpc (read only) 2557817 2557817 0 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4384 4384 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 214024 214024 0 0.0
.text 2173922 2173922 0 0.0
lock-app debug (read only) 2522617 2522649 32 0.0
(read/write) 124512 124512 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4416 4416 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 229064 229064 0 0.0
.text 2128482 2128514 32 0.0
ota-provider-app debug (read only) 2326209 2326209 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203832 203832 0 0.0
.text 1959698 1959698 0 0.0
ota-requestor-app debug (read only) 2443817 2443897 80 0.0
(read/write) 125216 125216 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67304 67304 0 0.0
.dynamic 608 608 0 0.0
.got 4472 4472 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207584 207584 0 0.0
.text 2065154 2065234 80 0.0
shell debug (read only) 2560065 2560241 176 0.0
(read/write) 141104 141104 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4128 4128 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 228114 228178 64 0.0
.text 2174946 2175058 112 0.0
thermostat-no-ble arm64 (read only) 2600548 2600548 0 0.0
(read/write) 158257 158257 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83216 83216 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165748 165748 0 0.0
.text 2195056 2195056 0 0.0
tv-app debug (read only) 3108121 3108153 32 0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4840 4840 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 249504 249504 0 0.0
.text 2670818 2670850 32 0.0
tv-casting-app debug (read only) 5350449 5350449 0 0.0
(read/write) 156848 156848 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 97928 97928 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 331657 331657 0 0.0
.text 4753538 4753538 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2449192 2449192 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1411836 1411836 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176643 1176675 32 0.0
bss 142900 142900 0 0.0
rodata 142204 142204 0 0.0
text 812636 812672 36 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156675 1156723 48 0.0
bss 142136 142136 0 0.0
rodata 133748 133748 0 0.0
text 801920 801956 36 0.0
p6 all-clusters-app default (read only) 882136 882136 0 0.0
(read/write) 1685036 1685100 64 0.0
.bss 148560 148560 0 0.0
.data 2648 2648 0 0.0
.text 1525440 1525504 64 0.0
all-clusters-minimal-app default (read only) 882856 882856 0 0.0
(read/write) 1629180 1629212 32 0.0
.bss 147840 147840 0 0.0
.data 2648 2648 0 0.0
.text 1470304 1470336 32 0.0
light-app default (read only) 891160 891160 0 0.0
(read/write) 1549220 1549220 0 0.0
.bss 139744 139744 0 0.0
.data 2440 2440 0 0.0
.text 1398648 1398648 0 0.0
lock-app default (read only) 891288 891288 0 0.0
(read/write) 1576220 1576220 0 0.0
.bss 139600 139600 0 0.0
.data 2456 2456 0 0.0
.text 1425776 1425776 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798700 798700 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 566812 566814 2 0.0
lighting-app tlsr9518adk80d (read/write) 818740 818740 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 583346 583348 2 0.0

@woody-apple woody-apple mentioned this pull request Jul 19, 2022
Closed
@woody-apple woody-apple merged commit c76fd9f into sve Jul 19, 2022
@woody-apple woody-apple deleted the cherry-pick-f6cfaaf182805d4cdd9387a7627379d396c4531f branch July 19, 2022 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bzbarsky-apple bzbarsky-apple bzbarsky-apple left review comments

@jmeg-sfy jmeg-sfy jmeg-sfy left review comments

Assignees
No one assigned
Labels
app controller examples sve cherry pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@woody-apple @bzbarsky-apple @jmeg-sfy