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

[SetUpCodePairer] Only search on network if no credentials are provid… #22166

Merged

Conversation

woody-apple
Copy link
Contributor

…ed to chip-tool pairing code commands

Problem

In #21664 chip-tool is used to add an other commissioner after having opened a commissioning window. In theory this operation should only happens on-network. But the fact that the qr code provided for the initial pairing is used get the setup code pairer to issue a BLE scan. That is not necessary and that is also an issue when testing in a lab with a lot of ble devices.

fix #21664

Change overview

  • If no credentials are provided to the setup code pairer issue a on-network only commissioning.

Testing

./out/debug/standalone/chip-tool pairing code-wifi 0x12344321 SSID PASSWORD MT:-24J042C00KA0648G00
./out/debug/standalone/chip-tool administratorcommissioning open-basic-commissioning-window 180 0x12344321 0 --timedInteractionTimeoutMs 100
./out/debug/standalone/chip-tool pairing code 0x43211234 MT:-24J042C00KA0648G00 --commissioner-name beta

@github-actions
Copy link

github-actions bot commented Aug 25, 2022

PR #22166: Size comparison from fb1c812 to f792480

Increases (7 builds for bl602, cc13x2_26x2, cyw30739, linux)
platform target config section fb1c812 f792480 change % change
bl602 lighting-app bl602 (read/write) 1383914 1383922 8 0.0
.text 1051068 1051072 4 0.0
bl602+rpc .text 1082824 1082828 4 0.0
cc13x2_26x2 pump-app LP_CC2652R7 (read only) 684727 684735 8 0.0
.text 594284 594292 8 0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599018 599026 8 0.0
.app_xip_area 476372 476380 8 0.0
linux chip-tool debug (read only) 10857273 10857449 176 0.0
.text 8777012 8777188 176 0.0
chip-tool-ipv6only arm64 (read only) 10249404 10249564 160 0.0
.text 8106756 8106916 160 0.0
tv-app debug (read only) 3174409 3174425 16 0.0
.text 2725810 2725826 16 0.0
Decreases (1 build for cc13x2_26x2)
platform target config section fb1c812 f792480 change % change
cc13x2_26x2 pump-app LP_CC2652R7 (read/write) 157808 157800 -8 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section fb1c812 f792480 change % change
bl602 lighting-app bl602 (read/write) 1383914 1383922 8 0.0
.bss 120290 120290 0 0.0
.data 4480 4480 0 0.0
.text 1051068 1051072 4 0.0
bl602+rpc (read/write) 1429426 1429426 0 0.0
.bss 127730 127730 0 0.0
.data 4600 4600 0 0.0
.text 1082824 1082828 4 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 672379 672379 0 0.0
(read/write) 179132 179132 0 0.0
.bss 74404 74404 0 0.0
.data 3372 3372 0 0.0
.rodata 88747 88747 0 0.0
.text 583316 583316 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 637747 637747 0 0.0
(read/write) 157980 157980 0 0.0
.bss 73692 73692 0 0.0
.data 3372 3372 0 0.0
.rodata 77979 77979 0 0.0
.text 559444 559444 0 0.0
lock-ftd LP_CC2652R7 (read only) 674063 674063 0 0.0
(read/write) 167664 167664 0 0.0
.bss 71508 71508 0 0.0
.data 3296 3296 0 0.0
.rodata 76671 76671 0 0.0
.text 596912 596912 0 0.0
lock-mtd LP_CC2652R7 (read only) 656807 656807 0 0.0
(read/write) 180608 180608 0 0.0
.bss 67196 67196 0 0.0
.data 3296 3296 0 0.0
.rodata 101759 101759 0 0.0
.text 554568 554568 0 0.0
pump-app LP_CC2652R7 (read only) 684727 684735 8 0.0
(read/write) 157808 157800 -8 -0.0
.bss 71548 71548 0 0.0
.data 3296 3296 0 0.0
.rodata 89959 89959 0 0.0
.text 594284 594292 8 0.0
pump-controller-app LP_CC2652R7 (read only) 669227 669227 0 0.0
(read/write) 173428 173428 0 0.0
.bss 71668 71668 0 0.0
.data 3292 3292 0 0.0
.rodata 85515 85515 0 0.0
.text 583232 583232 0 0.0
shell LP_CC2652R7 (read only) 665070 665070 0 0.0
(read/write) 181960 181960 0 0.0
.bss 76724 76724 0 0.0
.data 3376 3376 0 0.0
.rodata 85694 85694 0 0.0
.text 579060 579060 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586102 586102 0 0.0
.app_xip_area 462736 462736 0 0.0
.bss 65800 65800 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 591886 591886 0 0.0
.app_xip_area 463736 463736 0 0.0
.bss 70584 70584 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) 599018 599026 8 0.0
.app_xip_area 476372 476380 8 0.0
.bss 65112 65112 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 (read/write) 1103996 1103996 0 0.0
.bss 136148 136148 0 0.0
.data 2068 2068 0 0.0
.text 965756 965756 0 0.0
BRD4161A+rpc (read/write) 1158248 1158248 0 0.0
.bss 152836 152836 0 0.0
.data 2280 2280 0 0.0
.text 1003112 1003112 0 0.0
BRD4161A+rs911x (read/write) 996656 996656 0 0.0
.bss 168912 168912 0 0.0
.data 2056 2056 0 0.0
.text 825668 825668 0 0.0
lock-app BRD4161A+wf200 (read/write) 1145900 1145900 0 0.0
.bss 151992 151992 0 0.0
.data 2064 2064 0 0.0
.text 991824 991824 0 0.0
window-app BRD4161A (read/write) 1095404 1095404 0 0.0
.bss 137588 137588 0 0.0
.data 2096 2096 0 0.0
.text 955700 955700 0 0.0
esp32 all-clusters-app c3devkit (read only) 1030020 1030020 0 0.0
(read/write) 1488674 1488674 0 0.0
.dram0.bss 70864 70864 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 217776 217776 0 0.0
.flash.text 1030020 1030020 0 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1083371 1083371 0 0.0
(read/write) 490632 490632 0 0.0
.dram0.bss 76376 76376 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 248116 248116 0 0.0
.flash.text 1077987 1077987 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w0+release (read/write) 645508 645508 0 0.0
.bss 70232 70232 0 0.0
.data 2044 2044 0 0.0
.text 570504 570504 0 0.0
lock k32w0+release (read/write) 703028 703028 0 0.0
.bss 70704 70704 0 0.0
.data 2052 2052 0 0.0
.text 627544 627544 0 0.0
linux all-clusters-app debug (read only) 3034209 3034209 0 0.0
(read/write) 155920 155920 0 0.0
.bss 61888 61888 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 85560 85560 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1160 1160 0 0.0
.rodata 274443 274443 0 0.0
.text 2580690 2580690 0 0.0
all-clusters-minimal-app debug (read only) 2874049 2874049 0 0.0
(read/write) 147624 147624 0 0.0
.bss 61152 61152 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 78120 78120 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1152 1152 0 0.0
.rodata 274635 274635 0 0.0
.text 2423042 2423042 0 0.0
bridge-app debug+rpc (read only) 2372777 2372777 0 0.0
(read/write) 127584 127584 0 0.0
.bss 50656 50656 0 0.0
.data 3600 3600 0 0.0
.data.rel.ro 67464 67464 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 203432 203432 0 0.0
.text 2006722 2006722 0 0.0
chip-tool debug (read only) 10857273 10857449 176 0.0
(read/write) 656736 656736 0 0.0
.bss 25240 25240 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 621720 621720 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 560693 560693 0 0.0
.text 8777012 8777188 176 0.0
chip-tool-ipv6only arm64 (read only) 10249404 10249564 160 0.0
(read/write) 704593 704593 0 0.0
.bss 33297 33297 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 649248 649248 0 0.0
.dynamic 560 560 0 0.0
.got 13816 13816 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 491580 491580 0 0.0
.text 8106756 8106916 160 0.0
lighting-app debug+rpc (read only) 2596889 2596889 0 0.0
(read/write) 130176 130176 0 0.0
.bss 49760 49760 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72360 72360 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 220208 220208 0 0.0
.text 2205970 2205970 0 0.0
lock-app debug (read only) 2580689 2580689 0 0.0
(read/write) 125512 125512 0 0.0
.bss 48288 48288 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69512 69512 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 896 896 0 0.0
.rodata 237264 237264 0 0.0
.text 2176770 2176770 0 0.0
ota-provider-app debug (read only) 2357849 2357849 0 0.0
(read/write) 118976 118976 0 0.0
.bss 47808 47808 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63336 63336 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 760 760 0 0.0
.rodata 209240 209240 0 0.0
.text 1985138 1985138 0 0.0
ota-requestor-app debug (read only) 2523049 2523049 0 0.0
(read/write) 127320 127320 0 0.0
.bss 50336 50336 0 0.0
.data 2304 2304 0 0.0
.data.rel.ro 68728 68728 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 848 848 0 0.0
.rodata 216000 216000 0 0.0
.text 2134482 2134482 0 0.0
shell debug (read only) 2602497 2602497 0 0.0
(read/write) 142040 142040 0 0.0
.bss 57800 57800 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 77160 77160 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 234546 234546 0 0.0
.text 2209602 2209602 0 0.0
thermostat-no-ble arm64 (read only) 2356996 2356996 0 0.0
(read/write) 141825 141825 0 0.0
.bss 55345 55345 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75984 75984 0 0.0
.dynamic 560 560 0 0.0
.got 5048 5048 0 0.0
.init 24 24 0 0.0
.init_array 408 408 0 0.0
.rodata 140524 140524 0 0.0
.text 1978752 1978752 0 0.0
tv-app debug (read only) 3174409 3174425 16 0.0
(read/write) 257968 257968 0 0.0
.bss 167480 167480 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 79184 79184 0 0.0
.dynamic 608 608 0 0.0
.got 4856 4856 0 0.0
.init 27 27 0 0.0
.init_array 1072 1072 0 0.0
.rodata 258856 258856 0 0.0
.text 2725810 2725826 16 0.0
tv-casting-app debug (read only) 5455169 5455169 0 0.0
(read/write) 160048 160048 0 0.0
.bss 51448 51448 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 99736 99736 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 343217 343217 0 0.0
.text 4841298 4841298 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2454328 2454328 0 0.0
.bss 215076 215076 0 0.0
.data 5872 5872 0 0.0
.text 1416972 1416972 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1180099 1180099 0 0.0
bss 143759 143759 0 0.0
rodata 143268 143268 0 0.0
text 814116 814116 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1159959 1159959 0 0.0
bss 142996 142996 0 0.0
rodata 134944 134944 0 0.0
text 803104 803104 0 0.0
p6 all-clusters-app default (read only) 880984 880984 0 0.0
(read/write) 1699380 1699380 0 0.0
.bss 149704 149704 0 0.0
.data 2656 2656 0 0.0
.text 1538632 1538632 0 0.0
all-clusters-minimal-app default (read only) 881704 881704 0 0.0
(read/write) 1643388 1643388 0 0.0
.bss 148984 148984 0 0.0
.data 2656 2656 0 0.0
.text 1483360 1483360 0 0.0
light-app default (read only) 890048 890048 0 0.0
(read/write) 1560676 1560676 0 0.0
.bss 140848 140848 0 0.0
.data 2448 2448 0 0.0
.text 1408992 1408992 0 0.0
lock-app default (read only) 885552 885552 0 0.0
(read/write) 1597924 1597924 0 0.0
.bss 145328 145328 0 0.0
.data 2464 2464 0 0.0
.text 1441744 1441744 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 808800 808800 0 0.0
bss 71480 71480 0 0.0
noinit 43488 43488 0 0.0
text 571348 571348 0 0.0
lighting-app tlsr9518adk80d (read/write) 830776 830776 0 0.0
bss 72336 72336 0 0.0
noinit 43488 43488 0 0.0
text 589472 589472 0 0.0

@bzbarsky-apple
Copy link
Contributor

@woody-apple Please note #22195

@woody-apple woody-apple merged commit 0e5b2dd into sve-2 Aug 29, 2022
@woody-apple woody-apple deleted the cherry-pick-cf4cf8a6df6430fca12d564b6fcc2adeaf4df59f branch August 29, 2022 19:42
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