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

Pass controller vendor ID when creating a commisioner instance #21032

Merged
merged 4 commits into from
Jul 21, 2022
Merged

Pass controller vendor ID when creating a commisioner instance #21032

merged 4 commits into from
Jul 21, 2022

Conversation

ajwak
Copy link
Contributor

@ajwak ajwak commented Jul 20, 2022

Problem

SetupParams::controllerVendorId must now be properly set prior to commissioning or it will error out. Currently we have a hard-coded default set and no way to specify which vendor is in use.

Change overview

Added a controllerVendorId to the ControllerParams.java builder and is pulled by the CHIPDeviceController-JNI layer and passed the AndroidDeviceControllerWrapper on AllocateNew() call.

Testing

  • Built CHIPTool android app and walked through the provisioning flow for test m5stack device.

@restyled-io restyled-io bot mentioned this pull request Jul 20, 2022
Closed
@ajwak ajwak marked this pull request as ready for review July 20, 2022 23:21
@woody-apple woody-apple enabled auto-merge (squash) July 20, 2022 23:25
@github-actions
Copy link

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

PR #21032: Size comparison from 8145ce3 to c3c2a8c

Increases (2 builds for telink)
platform target config section 8145ce3 c3c2a8c2 change % change
telink light-switch-app tlsr9518adk80d (read/write) 798388 798396 8 0.0
text 566528 566532 4 0.0
lighting-app tlsr9518adk80d text 583074 583076 2 0.0
Full report (12 builds for bl602, cyw30739, k32w, linux, mbed, telink)
platform target config section 8145ce3 c3c2a8c2 change % change
bl602 lighting-app bl602 (read/write) 1379514 1379514 0 0.0
.bss 116970 116970 0 0.0
.data 4480 4480 0 0.0
.text 1050152 1050152 0 0.0
bl602+rpc (read/write) 1424922 1424922 0 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1081808 1081808 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581546 581546 0 0.0
.app_xip_area 460096 460096 0 0.0
.bss 64244 64244 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) 587462 587462 0 0.0
.app_xip_area 461284 461284 0 0.0
.bss 68972 68972 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) 584910 584910 0 0.0
.app_xip_area 464308 464308 0 0.0
.bss 63452 63452 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
k32w light k32w061+release (read/write) 660328 660328 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 582996 582996 0 0.0
lock k32w061+release (read/write) 687308 687308 0 0.0
.bss 70012 70012 0 0.0
.data 2004 2004 0 0.0
.text 609492 609492 0 0.0
linux chip-tool-ipv6only arm64 (read only) 9771188 9771188 0 0.0
(read/write) 679361 679361 0 0.0
.bss 32833 32833 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 624760 624760 0 0.0
.dynamic 560 560 0 0.0
.got 13544 13544 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 456884 456884 0 0.0
.text 7730084 7730084 0 0.0
thermostat-no-ble arm64 (read only) 2338060 2338060 0 0.0
(read/write) 141233 141233 0 0.0
.bss 55265 55265 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75552 75552 0 0.0
.dynamic 560 560 0 0.0
.got 4976 4976 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 138964 138964 0 0.0
.text 1962448 1962448 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448688 2448688 0 0.0
.bss 213948 213948 0 0.0
.data 5872 5872 0 0.0
.text 1411332 1411332 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798388 798396 8 0.0
bss 70584 70584 0 0.0
noinit 40416 40416 0 0.0
text 566528 566532 4 0.0
lighting-app tlsr9518adk80d (read/write) 818444 818444 0 0.0
bss 71428 71428 0 0.0
noinit 40416 40416 0 0.0
text 583074 583076 2 0.0

@github-actions
Copy link

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

PR #21032: Size comparison from 5132358 to d9cdca3

Decreases (4 builds for bl602, telink)
platform target config section 5132358 d9cdca3 change % change
bl602 lighting-app bl602 (read/write) 1379770 1379762 -8 -0.0
.text 1050408 1050404 -4 -0.0
bl602+rpc (read/write) 1425178 1425170 -8 -0.0
.text 1082064 1082060 -4 -0.0
telink light-switch-app tlsr9518adk80d text 566590 566588 -2 -0.0
lighting-app tlsr9518adk80d text 583134 583132 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 5132358 d9cdca3 change % change
bl602 lighting-app bl602 (read/write) 1379770 1379762 -8 -0.0
.bss 116970 116970 0 0.0
.data 4480 4480 0 0.0
.text 1050408 1050404 -4 -0.0
bl602+rpc (read/write) 1425178 1425170 -8 -0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1082064 1082060 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668095 668095 0 0.0
(read/write) 183152 183152 0 0.0
.bss 74140 74140 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579460 579460 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633695 633695 0 0.0
(read/write) 157708 157708 0 0.0
.bss 73436 73436 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 555820 555820 0 0.0
lock-ftd LP_CC2652R7 (read only) 671315 671315 0 0.0
(read/write) 170108 170108 0 0.0
.bss 71204 71204 0 0.0
.data 3280 3280 0 0.0
.rodata 76443 76443 0 0.0
.text 594392 594392 0 0.0
lock-mtd LP_CC2652R7 (read only) 653607 653607 0 0.0
(read/write) 183504 183504 0 0.0
.bss 66892 66892 0 0.0
.data 3280 3280 0 0.0
.rodata 101191 101191 0 0.0
.text 551936 551936 0 0.0
pump-app LP_CC2652R7 (read only) 680323 680323 0 0.0
(read/write) 161956 161956 0 0.0
.bss 71292 71292 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 591028 591028 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666099 666099 0 0.0
(read/write) 176300 176300 0 0.0
.bss 71412 71412 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 580944 580944 0 0.0
shell LP_CC2652R7 (read only) 660570 660570 0 0.0
(read/write) 186180 186180 0 0.0
.bss 76444 76444 0 0.0
.data 3360 3360 0 0.0
.rodata 85090 85090 0 0.0
.text 575164 575164 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581642 581642 0 0.0
.app_xip_area 460192 460192 0 0.0
.bss 64244 64244 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) 587566 587566 0 0.0
.app_xip_area 461388 461388 0 0.0
.bss 68972 68972 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) 585014 585014 0 0.0
.app_xip_area 464412 464412 0 0.0
.bss 63452 63452 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) 1086016 1086016 0 0.0
.bss 133060 133060 0 0.0
.data 2048 2048 0 0.0
.text 950888 950888 0 0.0
BRD4161A+rpc (read/write) 1140292 1140292 0 0.0
.bss 149732 149732 0 0.0
.data 2260 2260 0 0.0
.text 988276 988276 0 0.0
BRD4161A+rs911x (read/write) 972132 972132 0 0.0
.bss 161512 161512 0 0.0
.data 2048 2048 0 0.0
.text 808552 808552 0 0.0
lock-app BRD4161A+wf200 (read/write) 1127824 1127824 0 0.0
.bss 144152 144152 0 0.0
.data 2056 2056 0 0.0
.text 981596 981596 0 0.0
window-app BRD4161A (read/write) 1079508 1079508 0 0.0
.bss 134532 134532 0 0.0
.data 2076 2076 0 0.0
.text 942880 942880 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021672 1021672 0 0.0
(read/write) 1486130 1486130 0 0.0
.dram0.bss 70088 70088 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 216000 216000 0 0.0
.flash.text 1021672 1021672 0 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075463 1075463 0 0.0
(read/write) 488160 488160 0 0.0
.dram0.bss 75608 75608 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246412 246412 0 0.0
.flash.text 1070079 1070079 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660424 660424 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 583092 583092 0 0.0
lock k32w061+release (read/write) 687404 687404 0 0.0
.bss 70012 70012 0 0.0
.data 2004 2004 0 0.0
.text 609588 609588 0 0.0
linux all-clusters-app debug (read only) 2978593 2978593 0 0.0
(read/write) 155312 155312 0 0.0
.bss 61824 61824 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 85160 85160 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1064 1064 0 0.0
.rodata 264779 264779 0 0.0
.text 2535842 2535842 0 0.0
all-clusters-minimal-app debug (read only) 2824545 2824545 0 0.0
(read/write) 146984 146984 0 0.0
.bss 61024 61024 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 77720 77720 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 265675 265675 0 0.0
.text 2383554 2383554 0 0.0
bridge-app debug+rpc (read only) 2324657 2324657 0 0.0
(read/write) 125768 125768 0 0.0
.bss 49088 49088 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 67096 67096 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 198184 198184 0 0.0
.text 1964450 1964450 0 0.0
chip-tool debug (read only) 10347905 10347905 0 0.0
(read/write) 631848 631848 0 0.0
.bss 24760 24760 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 597416 597416 0 0.0
.dynamic 608 608 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 520629 520629 0 0.0
.text 8373828 8373828 0 0.0
chip-tool-ipv6only arm64 (read only) 9771188 9771188 0 0.0
(read/write) 679361 679361 0 0.0
.bss 32833 32833 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 624760 624760 0 0.0
.dynamic 560 560 0 0.0
.got 13544 13544 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 456884 456884 0 0.0
.text 7730084 7730084 0 0.0
lighting-app debug+rpc (read only) 2562401 2562401 0 0.0
(read/write) 129856 129856 0 0.0
.bss 49664 49664 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72248 72248 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 214000 214000 0 0.0
.text 2178146 2178146 0 0.0
lock-app debug (read only) 2527281 2527281 0 0.0
(read/write) 124808 124808 0 0.0
.bss 48032 48032 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69208 69208 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 229008 229008 0 0.0
.text 2132818 2132818 0 0.0
ota-provider-app debug (read only) 2330865 2330865 0 0.0
(read/write) 118608 118608 0 0.0
.bss 47680 47680 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63192 63192 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 203800 203800 0 0.0
.text 1964002 1964002 0 0.0
ota-requestor-app debug (read only) 2449465 2449465 0 0.0
(read/write) 125544 125544 0 0.0
.bss 50048 50048 0 0.0
.data 2240 2240 0 0.0
.data.rel.ro 67416 67416 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 207552 207552 0 0.0
.text 2070450 2070450 0 0.0
shell debug (read only) 2565105 2565105 0 0.0
(read/write) 141336 141336 0 0.0
.bss 57608 57608 0 0.0
.data 1248 1248 0 0.0
.data.rel.ro 76792 76792 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 228082 228082 0 0.0
.text 2179634 2179634 0 0.0
thermostat-no-ble arm64 (read only) 2338540 2338540 0 0.0
(read/write) 141233 141233 0 0.0
.bss 55265 55265 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75552 75552 0 0.0
.dynamic 560 560 0 0.0
.got 4976 4976 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 138964 138964 0 0.0
.text 1962928 1962928 0 0.0
tv-app debug (read only) 3112921 3112921 0 0.0
(read/write) 256960 256960 0 0.0
.bss 167064 167064 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 78728 78728 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 249512 249512 0 0.0
.text 2675154 2675154 0 0.0
tv-casting-app debug (read only) 5366473 5366473 0 0.0
(read/write) 158264 158264 0 0.0
.bss 51256 51256 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 98288 98288 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 333601 333601 0 0.0
.text 4766514 4766514 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448816 2448816 0 0.0
.bss 213948 213948 0 0.0
.data 5872 5872 0 0.0
.text 1411460 1411460 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176003 1176003 0 0.0
bss 142908 142908 0 0.0
rodata 142204 142204 0 0.0
text 811992 811992 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156067 1156067 0 0.0
bss 142144 142144 0 0.0
rodata 133748 133748 0 0.0
text 801308 801308 0 0.0
p6 all-clusters-app default (read only) 882128 882128 0 0.0
(read/write) 1685572 1685572 0 0.0
.bss 148568 148568 0 0.0
.data 2648 2648 0 0.0
.text 1525968 1525968 0 0.0
all-clusters-minimal-app default (read only) 882848 882848 0 0.0
(read/write) 1629684 1629684 0 0.0
.bss 147848 147848 0 0.0
.data 2648 2648 0 0.0
.text 1470800 1470800 0 0.0
light-app default (read only) 891152 891152 0 0.0
(read/write) 1549892 1549892 0 0.0
.bss 139752 139752 0 0.0
.data 2440 2440 0 0.0
.text 1399312 1399312 0 0.0
lock-app default (read only) 886680 886680 0 0.0
(read/write) 1587500 1587500 0 0.0
.bss 144208 144208 0 0.0
.data 2456 2456 0 0.0
.text 1432448 1432448 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798452 798452 0 0.0
bss 70584 70584 0 0.0
noinit 40416 40416 0 0.0
text 566590 566588 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 818500 818500 0 0.0
bss 71428 71428 0 0.0
noinit 40416 40416 0 0.0
text 583134 583132 -2 -0.0

@woody-apple woody-apple merged commit 077128d into project-chip:master Jul 21, 2022
@ajwak ajwak deleted the params branch July 21, 2022 15:21
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
@ajwak @isiu-apple
Pass controller vendor ID when creating a commisioner instance (proje…
87152d2 
…ct-chip#21032)

* Pass controller vendor ID when creating a commisioner instance

* clean up clang-format issue

* clean up clang-format issue 2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@woody-apple woody-apple woody-apple approved these changes

@msandstedt msandstedt msandstedt 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

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@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

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@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

@kghost kghost Awaiting requested review from kghost

@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

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
controller review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ajwak @msandstedt @woody-apple