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

Pass the country code via commissioning parameters. #17284

Merged

Conversation

bzbarsky-apple
Copy link
Contributor

We shouldn't assume the configuration manager exists on the
commissioner, or stores anything useful, so switch to passing in the
country code via commissioning parameters instead of reading it from
the configuration manager.

Problem

See above.

Change overview

See above.

Testing

Not sure how to test this so far....

We shouldn't assume the configuration manager exists on the
commissioner, or stores anything useful, so switch to passing in the
country code via commissioning parameters instead of reading it from
the configuration manager.
@github-actions
Copy link

github-actions bot commented Apr 12, 2022

PR #17284: Size comparison from 2c15978 to cc2fd03

Increases (3 builds for linux)
platform target config section 2c15978 cc2fd03 change % change
linux chip-tool debug (read only) 10676501 10677813 1312 0.0
.rodata 537973 538037 64 0.0
.text 9309221 9310469 1248 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 1027722 10278388 1168 0.0
.text 8661732 8662916 1184 0.0
tv-app debug (read only) 2795649 2796289 640 0.0
(read/write) 250680 250712 32 0.0
.bss 164104 164136 32 0.0
.rodata 213259 213323 64 0.0
.text 2401090 2401666 576 0.0
Decreases (1 build for linux)
platform target config section 2c15978 cc2fd03 change % change
linux chip-tool-no-interactive-ipv6only arm64 .rodata 512228 512212 -16 -0.0
Full report (31 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 2c15978 cc2fd03 change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read only) 639911 639911 0 0.0
(read/write) 151212 151212 0 0.0
.bss 74144 74144 0 0.0
.data 3212 3212 0 0.0
.rodata 80143 80143 0 0.0
.text 559276 559276 0 0.0
lock-mtd LP_CC2652R7 (read only) 588655 588655 0 0.0
(read/write) 146932 146932 0 0.0
.bss 69864 69864 0 0.0
.data 3212 3212 0 0.0
.rodata 80023 80023 0 0.0
.text 508140 508140 0 0.0
pump-app LP_CC2652R7 (read only) 647995 647995 0 0.0
(read/write) 152508 152508 0 0.0
.bss 74640 74640 0 0.0
.data 3244 3244 0 0.0
.rodata 75331 75331 0 0.0
.text 572176 572176 0 0.0
pump-controller-app LP_CC2652R7 (read only) 641967 641967 0 0.0
(read/write) 152176 152176 0 0.0
.bss 74344 74344 0 0.0
.data 3208 3208 0 0.0
.rodata 78967 78967 0 0.0
.text 562512 562512 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 618514 618514 0 0.0
.app_xip_area 525224 525224 0 0.0
.bss 75956 75956 0 0.0
.data 684 684 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 576126 576126 0 0.0
.app_xip_area 484372 484372 0 0.0
.bss 74452 74452 0 0.0
.data 648 648 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 564642 564642 0 0.0
.app_xip_area 463260 463260 0 0.0
.bss 83784 83784 0 0.0
.data 564 564 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 907004 907004 0 0.0
(read/write) 133080 133080 0 0.0
.bss 131040 131040 0 0.0
.data 2040 2040 0 0.0
.text 906996 906996 0 0.0
BRD4161A+rpc (read only) 941372 941372 0 0.0
(read/write) 149764 149764 0 0.0
.bss 147520 147520 0 0.0
.data 2244 2244 0 0.0
.text 941364 941364 0 0.0
window-app BRD4161A (read only) 843996 843996 0 0.0
(read/write) 131148 131148 0 0.0
.bss 129200 129200 0 0.0
.data 1948 1948 0 0.0
.text 843988 843988 0 0.0
esp32 all-clusters-app c3devkit (read only) 979666 979666 0 0.0
(read/write) 1397514 1397514 0 0.0
.dram0.bss 62624 62624 0 0.0
.dram0.data 14420 14420 0 0.0
.flash.rodata 201552 201552 0 0.0
.flash.text 979666 979666 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1035255 1035255 0 0.0
(read/write) 465252 465252 0 0.0
.dram0.bss 68144 68144 0 0.0
.dram0.data 34152 34152 0 0.0
.flash.rodata 231120 231120 0 0.0
.flash.text 1029871 1029871 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 686728 686728 0 0.0
.bss 78128 78128 0 0.0
.data 2036 2036 0 0.0
.text 600764 600764 0 0.0
lock k32w061+release (read/write) 691360 691360 0 0.0
.bss 78704 78704 0 0.0
.data 1996 1996 0 0.0
.text 604860 604860 0 0.0
linux all-clusters-app debug (read only) 2696353 2696353 0 0.0
(read/write) 149120 149120 0 0.0
.bss 60192 60192 0 0.0
.data 1888 1888 0 0.0
.data.rel.ro 80984 80984 0 0.0
.dynamic 608 608 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 984 984 0 0.0
.rodata 232421 232421 0 0.0
.text 2289938 2289938 0 0.0
bridge-app debug+rpc (read only) 1835933 1835933 0 0.0
(read/write) 91752 91752 0 0.0
.bss 44472 44472 0 0.0
.data 2912 2912 0 0.0
.data.rel.ro 39280 39280 0 0.0
.dynamic 592 592 0 0.0
.got 3936 3936 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 148473 148473 0 0.0
.text 1569029 1569029 0 0.0
chip-tool debug (read only) 10676501 10677813 1312 0.0
(read/write) 371832 371832 0 0.0
.bss 22752 22752 0 0.0
.data 1104 1104 0 0.0
.data.rel.ro 341728 341728 0 0.0
.dynamic 624 624 0 0.0
.got 4936 4936 0 0.0
.init 27 27 0 0.0
.init_array 656 656 0 0.0
.rodata 537973 538037 64 0.0
.text 9309221 9310469 1248 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 1027722 10278388 1168 0.0
(read/write) 492193 492193 0 0.0
.bss 41009 41009 0 0.0
.data 1168 1168 0 0.0
.data.rel.ro 388816 388816 0 0.0
.dynamic 560 560 0 0.0
.got 57392 57392 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 512228 512212 -16 -0.0
.text 8661732 8662916 1184 0.0
door-lock-app debug (read only) 2107313 2107313 0 0.0
(read/write) 119504 119504 0 0.0
.bss 48064 48064 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 64408 64408 0 0.0
.dynamic 592 592 0 0.0
.got 4264 4264 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 186697 186697 0 0.0
.text 1764914 1764914 0 0.0
lighting-app debug+rpc (read only) 2312137 2312137 0 0.0
(read/write) 127824 127824 0 0.0
.bss 50272 50272 0 0.0
.data 1952 1952 0 0.0
.data.rel.ro 69896 69896 0 0.0
.dynamic 608 608 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 182633 182633 0 0.0
.text 1963666 1963666 0 0.0
ota-provider-app debug (read only) 2044465 2044465 0 0.0
(read/write) 114944 114944 0 0.0
.bss 47968 47968 0 0.0
.data 1608 1608 0 0.0
.data.rel.ro 59624 59624 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 172451 172451 0 0.0
.text 1715826 1715826 0 0.0
ota-requestor-app debug (read only) 2074873 2074873 0 0.0
(read/write) 118264 118264 0 0.0
.bss 48928 48928 0 0.0
.data 1864 1864 0 0.0
.data.rel.ro 61864 61864 0 0.0
.dynamic 592 592 0 0.0
.got 4304 4304 0 0.0
.init 27 27 0 0.0
.init_array 656 656 0 0.0
.rodata 169356 169356 0 0.0
.text 1747458 1747458 0 0.0
shell debug (read only) 2524145 2524145 0 0.0
(read/write) 149968 149968 0 0.0
.bss 67624 67624 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 75368 75368 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 214674 214674 0 0.0
.text 2148306 2148306 0 0.0
thermostat-no-ble arm64 (read only) 2352700 2352700 0 0.0
(read/write) 150993 150993 0 0.0
.bss 63153 63153 0 0.0
.data 1424 1424 0 0.0
.data.rel.ro 78632 78632 0 0.0
.dynamic 560 560 0 0.0
.got 4768 4768 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 144668 144668 0 0.0
.text 1979456 1979456 0 0.0
tv-app debug (read only) 2795649 2796289 640 0.0
(read/write) 250680 250712 32 0.0
.bss 164104 164136 32 0.0
.data 4448 4448 0 0.0
.data.rel.ro 75912 75912 0 0.0
.dynamic 592 592 0 0.0
.got 4688 4688 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 213259 213323 64 0.0
.text 2401090 2401666 576 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2368260 2368260 0 0.0
.bss 185236 185236 0 0.0
.data 5840 5840 0 0.0
.text 1330860 1330860 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1155895 1155895 0 0.0
bss 135464 135464 0 0.0
rodata 146768 146768 0 0.0
text 794976 794976 0 0.0
p6 all-clusters-app default (read/write) 2514688 2514688 0 0.0
.bss 118640 118640 0 0.0
.data 2768 2768 0 0.0
.text 1472952 1472952 0 0.0
light-app default (read/write) 2415160 2415160 0 0.0
.bss 112136 112136 0 0.0
.data 2576 2576 0 0.0
.text 1373424 1373424 0 0.0
lock-app default (read/write) 2378712 2378712 0 0.0
.bss 111880 111880 0 0.0
.data 2536 2536 0 0.0
.text 1336976 1336976 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 800992 800992 0 0.0
bss 69988 69988 0 0.0
noinit 40416 40416 0 0.0
text 569690 569690 0 0.0

Copy link
Contributor

@cecille cecille left a comment

Choose a reason for hiding this comment

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

Testing suggestion: You can test this in the commissiong_test.py cirque test. There is a truly insane amount of plumbing to get through to the python layer, but it's do-able. In src/controller/python/ChipDeviceController-ScriptBinding.cpp, there is a set of commissioning parameters that we use for commissioning. There are functions to set the wifi and thread data sets, this can be extended out to set also the country code (you'd have to add the plumbing). In commissioning_test.py, set the country code before TestKeyExchange, then check that the value is reflected in the basic info cluster.

src/controller/CHIPDeviceController.cpp Show resolved Hide resolved
@bzbarsky-apple
Copy link
Contributor Author

Testing suggestion:

Filed #17368

@bzbarsky-apple bzbarsky-apple deleted the country-code-commissioning branch April 14, 2022 03:19
andrei-menzopol pushed a commit to andrei-menzopol/connectedhomeip that referenced this pull request Apr 14, 2022
We shouldn't assume the configuration manager exists on the
commissioner, or stores anything useful, so switch to passing in the
country code via commissioning parameters instead of reading it from
the configuration manager.
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.

5 participants