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

Fix BLE device name for qpg and EFR32 to match the other platforms. #18006

Merged
merged 1 commit into from
May 4, 2022
Merged

Fix BLE device name for qpg and EFR32 to match the other platforms. #18006

merged 1 commit into from
May 4, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

These had hardcoded 0, while other platforms use the discriminator.

Fixes #112

Problem

See above.

Change overview

See above.

Testing

Not clear how to test this, apart from CI compilation testing.

@restyled-io restyled-io bot mentioned this pull request May 3, 2022
Closed
@github-actions
Copy link

github-actions bot commented May 3, 2022 •
edited
Loading

PR #18006: Size comparison from 1dc522d to a8b197b

Full report (18 builds for cc13x2_26x2, cyw30739, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 1dc522d a8b197b change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 688983 688983 0 0.0
(read/write) 163304 163304 0 0.0
.bss 75268 75268 0 0.0
.data 3400 3400 0 0.0
.rodata 102343 102343 0 0.0
.text 586156 586156 0 0.0
lock-ftd LP_CC2652R7 (read only) 676839 676839 0 0.0
(read/write) 166704 166704 0 0.0
.bss 73580 73580 0 0.0
.data 3224 3224 0 0.0
.rodata 94399 94399 0 0.0
.text 581960 581960 0 0.0
lock-mtd LP_CC2652R7 (read only) 625599 625599 0 0.0
(read/write) 146384 146384 0 0.0
.bss 69300 69300 0 0.0
.data 3224 3224 0 0.0
.rodata 94287 94287 0 0.0
.text 530824 530824 0 0.0
pump-app LP_CC2652R7 (read only) 661403 661403 0 0.0
(read/write) 183380 183380 0 0.0
.bss 73796 73796 0 0.0
.data 3256 3256 0 0.0
.rodata 80451 80451 0 0.0
.text 580468 580468 0 0.0
pump-controller-app LP_CC2652R7 (read only) 654307 654307 0 0.0
(read/write) 190276 190276 0 0.0
.bss 73852 73852 0 0.0
.data 3220 3220 0 0.0
.rodata 83395 83395 0 0.0
.text 570428 570428 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 626234 626234 0 0.0
.app_xip_area 528752 528752 0 0.0
.bss 80132 80132 0 0.0
.data 696 696 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 624938 624938 0 0.0
.app_xip_area 528920 528920 0 0.0
.bss 78708 78708 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 574058 574058 0 0.0
.app_xip_area 468420 468420 0 0.0
.bss 88032 88032 0 0.0
.data 572 572 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
k32w light k32w061+release (read/write) 684100 684100 0 0.0
.bss 81336 81336 0 0.0
.data 2008 2008 0 0.0
.text 599052 599052 0 0.0
lock k32w061+release (read/write) 728900 728900 0 0.0
.bss 81760 81760 0 0.0
.data 1968 1968 0 0.0
.text 643468 643468 0 0.0
linux chip-tool-no-interactive-ipv6only arm64 (read only) 8817700 8817700 0 0.0
(read/write) 642641 642641 0 0.0
.bss 40913 40913 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 581752 581752 0 0.0
.dynamic 560 560 0 0.0
.got 14960 14960 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 431460 431460 0 0.0
.text 6927732 6927732 0 0.0
thermostat-no-ble arm64 (read only) 2360820 2360820 0 0.0
(read/write) 174593 174593 0 0.0
.bss 86289 86289 0 0.0
.data 1496 1496 0 0.0
.data.rel.ro 79048 79048 0 0.0
.dynamic 560 560 0 0.0
.got 4728 4728 0 0.0
.init 24 24 0 0.0
.init_array 376 376 0 0.0
.rodata 145828 145828 0 0.0
.text 1985872 1985872 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2417972 2417972 0 0.0
.bss 205900 205900 0 0.0
.data 5856 5856 0 0.0
.text 1380572 1380572 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1177539 1177539 0 0.0
bss 139620 139620 0 0.0
rodata 150780 150780 0 0.0
text 808504 808504 0 0.0
p6 all-clusters-app default (read/write) 2528640 2528640 0 0.0
.bss 139272 139272 0 0.0
.data 2792 2792 0 0.0
.text 1486904 1486904 0 0.0
light-app default (read/write) 2419240 2419240 0 0.0
.bss 132736 132736 0 0.0
.data 2592 2592 0 0.0
.text 1377504 1377504 0 0.0
lock-app default (read/write) 2428528 2428528 0 0.0
.bss 132560 132560 0 0.0
.data 2552 2552 0 0.0
.text 1386792 1386792 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 804352 804352 0 0.0
bss 72252 72252 0 0.0
noinit 40416 40416 0 0.0
text 571170 571170 0 0.0

@bzbarsky-apple
Fix BLE device name for qpg and EFR32 to match the other platforms.
267c460 
These had hardcoded 0, while other platforms use the discriminator.

Fixes project-chip#112
@bzbarsky-apple bzbarsky-apple force-pushed the fix-BLE-device-name branch from a8b197b to 267c460 Compare May 3, 2022 18:28
@github-actions
Copy link

github-actions bot commented May 3, 2022 •
edited
Loading

PR #18006: Size comparison from 1dc522d to 267c460

Increases (5 builds for efr32)
platform target config section 1dc522d 267c460 change % change
efr32 lighting-app BRD4161A (read only) 908232 908264 32 0.0
.text 908224 908256 32 0.0
BRD4161A+rpc (read only) 942592 942608 16 0.0
.text 942584 942600 16 0.0
BRD4161A+rs911x (read only) 746612 746628 16 0.0
.text 746604 746620 16 0.0
lock-app BRD4161A+wf200 (read only) 916408 916436 28 0.0
.text 916400 916428 28 0.0
window-app BRD4161A (read only) 845480 845496 16 0.0
.text 845472 845488 16 0.0
Full report (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 1dc522d 267c460 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 688983 688983 0 0.0
(read/write) 163304 163304 0 0.0
.bss 75268 75268 0 0.0
.data 3400 3400 0 0.0
.rodata 102343 102343 0 0.0
.text 586156 586156 0 0.0
lock-ftd LP_CC2652R7 (read only) 676839 676839 0 0.0
(read/write) 166704 166704 0 0.0
.bss 73580 73580 0 0.0
.data 3224 3224 0 0.0
.rodata 94399 94399 0 0.0
.text 581960 581960 0 0.0
lock-mtd LP_CC2652R7 (read only) 625599 625599 0 0.0
(read/write) 146384 146384 0 0.0
.bss 69300 69300 0 0.0
.data 3224 3224 0 0.0
.rodata 94287 94287 0 0.0
.text 530824 530824 0 0.0
pump-app LP_CC2652R7 (read only) 661403 661403 0 0.0
(read/write) 183380 183380 0 0.0
.bss 73796 73796 0 0.0
.data 3256 3256 0 0.0
.rodata 80451 80451 0 0.0
.text 580468 580468 0 0.0
pump-controller-app LP_CC2652R7 (read only) 654307 654307 0 0.0
(read/write) 190276 190276 0 0.0
.bss 73852 73852 0 0.0
.data 3220 3220 0 0.0
.rodata 83395 83395 0 0.0
.text 570428 570428 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 626234 626234 0 0.0
.app_xip_area 528752 528752 0 0.0
.bss 80132 80132 0 0.0
.data 696 696 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 624938 624938 0 0.0
.app_xip_area 528920 528920 0 0.0
.bss 78708 78708 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 574058 574058 0 0.0
.app_xip_area 468420 468420 0 0.0
.bss 88032 88032 0 0.0
.data 572 572 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 908232 908264 32 0.0
(read/write) 134544 134544 0 0.0
.bss 132488 132488 0 0.0
.data 2052 2052 0 0.0
.text 908224 908256 32 0.0
BRD4161A+rpc (read only) 942592 942608 16 0.0
(read/write) 151224 151224 0 0.0
.bss 148968 148968 0 0.0
.data 2256 2256 0 0.0
.text 942584 942600 16 0.0
BRD4161A+rs911x (read only) 746612 746628 16 0.0
(read/write) 128768 128768 0 0.0
.bss 126788 126788 0 0.0
.data 1980 1980 0 0.0
.text 746604 746620 16 0.0
lock-app BRD4161A+wf200 (read only) 916408 916436 28 0.0
(read/write) 127556 127556 0 0.0
.bss 125620 125620 0 0.0
.data 1936 1936 0 0.0
.text 916400 916428 28 0.0
window-app BRD4161A (read only) 845480 845496 16 0.0
(read/write) 132632 132632 0 0.0
.bss 130664 130664 0 0.0
.data 1964 1964 0 0.0
.text 845472 845488 16 0.0
esp32 all-clusters-app c3devkit (read only) 999534 999534 0 0.0
(read/write) 1474498 1474498 0 0.0
.dram0.bss 68400 68400 0 0.0
.dram0.data 14428 14428 0 0.0
.flash.rodata 207224 207224 0 0.0
.flash.text 999534 999534 0 0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1054751 1054751 0 0.0
(read/write) 476928 476928 0 0.0
.dram0.bss 73920 73920 0 0.0
.dram0.data 34176 34176 0 0.0
.flash.rodata 236996 236996 0 0.0
.flash.text 1049367 1049367 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 684100 684100 0 0.0
.bss 81336 81336 0 0.0
.data 2008 2008 0 0.0
.text 599052 599052 0 0.0
lock k32w061+release (read/write) 728900 728900 0 0.0
.bss 81760 81760 0 0.0
.data 1968 1968 0 0.0
.text 643468 643468 0 0.0
linux all-clusters-app debug (read only) 2729913 2729913 0 0.0
(read/write) 173144 173144 0 0.0
.bss 83360 83360 0 0.0
.data 2000 2000 0 0.0
.data.rel.ro 81656 81656 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 1008 1008 0 0.0
.rodata 235173 235173 0 0.0
.text 2320114 2320114 0 0.0
bridge-app debug+rpc (read only) 1884977 1884977 0 0.0
(read/write) 120440 120440 0 0.0
.bss 71360 71360 0 0.0
.data 3424 3424 0 0.0
.data.rel.ro 40312 40312 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 688 688 0 0.0
.rodata 160417 160417 0 0.0
.text 1602162 1602162 0 0.0
chip-tool debug (read only) 8977653 8977653 0 0.0
(read/write) 576464 576464 0 0.0
.bss 22592 22592 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 546472 546472 0 0.0
.dynamic 624 624 0 0.0
.got 4952 4952 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 463733 463733 0 0.0
.text 7190773 7190773 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 8817700 8817700 0 0.0
(read/write) 642641 642641 0 0.0
.bss 40913 40913 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 581752 581752 0 0.0
.dynamic 560 560 0 0.0
.got 14960 14960 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 431460 431460 0 0.0
.text 6927732 6927732 0 0.0
lighting-app debug+rpc (read only) 2319369 2319369 0 0.0
(read/write) 151392 151392 0 0.0
.bss 73408 73408 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 70248 70248 0 0.0
.dynamic 608 608 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 184617 184617 0 0.0
.text 1968498 1968498 0 0.0
lock-app debug (read only) 2225585 2225585 0 0.0
(read/write) 145976 145976 0 0.0
.bss 72032 72032 0 0.0
.data 1504 1504 0 0.0
.data.rel.ro 66760 66760 0 0.0
.dynamic 592 592 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 752 752 0 0.0
.rodata 194353 194353 0 0.0
.text 1871330 1871330 0 0.0
ota-provider-app debug (read only) 2054225 2054225 0 0.0
(read/write) 138992 138992 0 0.0
.bss 71424 71424 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 60104 60104 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 175099 175099 0 0.0
.text 1722002 1722002 0 0.0
ota-requestor-app debug (read only) 2085281 2085281 0 0.0
(read/write) 141800 141800 0 0.0
.bss 72064 72064 0 0.0
.data 1928 1928 0 0.0
.data.rel.ro 62184 62184 0 0.0
.dynamic 592 592 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 171372 171372 0 0.0
.text 1755298 1755298 0 0.0
shell debug (read only) 2554969 2554969 0 0.0
(read/write) 197104 197104 0 0.0
.bss 114088 114088 0 0.0
.data 1376 1376 0 0.0
.data.rel.ro 75920 75920 0 0.0
.dynamic 592 592 0 0.0
.got 4184 4184 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 216722 216722 0 0.0
.text 2176722 2176722 0 0.0
thermostat-no-ble arm64 (read only) 2360820 2360820 0 0.0
(read/write) 174593 174593 0 0.0
.bss 86289 86289 0 0.0
.data 1496 1496 0 0.0
.data.rel.ro 79048 79048 0 0.0
.dynamic 560 560 0 0.0
.got 4728 4728 0 0.0
.init 24 24 0 0.0
.init_array 376 376 0 0.0
.rodata 145828 145828 0 0.0
.text 1985872 1985872 0 0.0
tv-app debug (read only) 2841569 2841569 0 0.0
(read/write) 276704 276704 0 0.0
.bss 189272 189272 0 0.0
.data 4640 4640 0 0.0
.data.rel.ro 76552 76552 0 0.0
.dynamic 592 592 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 217259 217259 0 0.0
.text 2442114 2442114 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2417972 2417972 0 0.0
.bss 205900 205900 0 0.0
.data 5856 5856 0 0.0
.text 1380572 1380572 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1177539 1177539 0 0.0
bss 139620 139620 0 0.0
rodata 150780 150780 0 0.0
text 808504 808504 0 0.0
p6 all-clusters-app default (read/write) 2528640 2528640 0 0.0
.bss 139272 139272 0 0.0
.data 2792 2792 0 0.0
.text 1486904 1486904 0 0.0
light-app default (read/write) 2419240 2419240 0 0.0
.bss 132736 132736 0 0.0
.data 2592 2592 0 0.0
.text 1377504 1377504 0 0.0
lock-app default (read/write) 2428528 2428528 0 0.0
.bss 132560 132560 0 0.0
.data 2552 2552 0 0.0
.text 1386792 1386792 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 804352 804352 0 0.0
bss 72252 72252 0 0.0
noinit 40416 40416 0 0.0
text 571170 571170 0 0.0

@bzbarsky-apple bzbarsky-apple merged commit a932e78 into project-chip:master May 4, 2022
@bzbarsky-apple bzbarsky-apple deleted the fix-BLE-device-name branch May 4, 2022 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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

@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

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@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

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@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

@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

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@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

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

@andy31415 andy31415 Awaiting requested review from andy31415

@msandstedt msandstedt Awaiting requested review from msandstedt

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

Successfully merging this pull request may close these issues.

BLE Device name is hardcoded
3 participants
@bzbarsky-apple @andy31415 @msandstedt