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

Update BLE manager to use correct type/remove unnecessary adv interval #22694

Merged
merged 1 commit into from
Sep 16, 2022
Merged

Update BLE manager to use correct type/remove unnecessary adv interval #22694

merged 1 commit into from
Sep 16, 2022

Conversation

adabreuti
Copy link
Contributor

@adabreuti adabreuti commented Sep 16, 2022 •
edited
Loading

Problem
CC13X2 CC26X2 platform BLE manager utilizes incorrect type for GAP Adv API which may cause instability.
#22696
Change overview
Update BLE manager to use correct type for API and advertising flags. Remove redundant advertising intervals in sysconfig as this is already being set by the CHIP stack.

Testing
Verified build/commissioning is successful and that advertising interval is still consistent with CHIP specifications.

@github-actions
Copy link

github-actions bot commented Sep 16, 2022 •
edited
Loading

PR #22694: Size comparison from 69551a1 to d2573a6

Increases (7 builds for cc13x2_26x2, esp32, psoc6, telink)
platform target config section 69551a1 d2573a6 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 174972 174980 8 0.0
lock-mtd LP_CC2652R7 (read/write) 182444 182452 8 0.0
pump-app LP_CC2652R7 (read/write) 162124 162132 8 0.0
esp32 all-clusters-app m5stack (read/write) 563924 563932 8 0.0
.flash.rodata 314656 314664 8 0.0
psoc6 all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26548053 26548055 2 0.0
light cy8ckit_062s2_43012 .debug_info 22013489 22013490 1 0.0
telink ota-requestor-app tlsr9518adk80d text 598972 598974 2 0.0
Decreases (10 builds for bl602, bl702, cc13x2_26x2, efr32, psoc6, telink)
platform target config section 69551a1 d2573a6 change % change
bl602 lighting-app bl602 .text 1064920 1064918 -2 -0.0
bl702 lighting-app bl702 .debug_info 37891398 37891397 -1 -0.0
.text 956776 956774 -2 -0.0
bl702+rpc .debug_info 41797969 41797967 -2 -0.0
.text 1030480 1030476 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676563 676555 -8 -0.0
.text 586664 586656 -8 -0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640819 640811 -8 -0.0
.text 561760 561752 -8 -0.0
lock-mtd LP_CC2652R7 (read only) 661947 661939 -8 -0.0
.text 558344 558336 -8 -0.0
pump-app LP_CC2652R7 (read only) 687283 687275 -8 -0.0
.text 596292 596284 -8 -0.0
efr32 lighting-app BRD4161A+rpc (read/write) 973444 973428 -16 -0.0
.text 820328 820312 -16 -0.0
psoc6 lock cy8ckit_062s2_43012 .debug_info 22392810 22392809 -1 -0.0
telink lighting-app tlsr9518adk80d (read/write) 835632 835624 -8 -0.0
text 592734 592730 -4 -0.0
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 69551a1 d2573a6 change % change
bl602 lighting-app bl602 (read/write) 1383062 1383062 0 0.0
.bss 89337 89337 0 0.0
.data 9816 9816 0 0.0
.text 1064920 1064918 -2 -0.0
bl602+rpc (read/write) 1428282 1428282 0 0.0
.bss 96769 96769 0 0.0
.data 10200 10200 0 0.0
.text 1096266 1096266 0 0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188011 1188011 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 66958 66958 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1506733 1506733 0 0.0
.debug_aranges 133072 133072 0 0.0
.debug_frame 486352 486352 0 0.0
.debug_info 37891398 37891397 -1 -0.0
.debug_line 5251788 5251788 0 0.0
.debug_loc 3361741 3361741 0 0.0
.debug_ranges 359696 359696 0 0.0
.debug_str 3455343 3455343 0 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 116488 116488 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 564895 564895 0 0.0
.symtab 171616 171616 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
956776 956774 -2 -0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1283939 1283939 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75006 75006 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644312 1644312 0 0.0
.debug_aranges 140576 140576 0 0.0
.debug_frame 511728 511728 0 0.0
.debug_info 41797969 41797967 -2 -0.0
.debug_line 5626327 5626327 0 0.0
.debug_loc 3554409 3554409 0 0.0
.debug_ranges 382152 382152 0 0.0
.debug_str 3851310 3851310 0 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 129896 129896 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624068 624068 0 0.0
.symtab 189424 189424 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030480 1030476 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676563 676555 -8 -0.0
(read/write) 174972 174980 8 0.0
.bss 81228 81228 0 0.0
.data 3380 3380 0 0.0
.rodata 89587 89587 0 0.0
.text 586664 586656 -8 -0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640819 640811 -8 -0.0
(read/write) 157996 157996 0 0.0
.bss 80500 80500 0 0.0
.data 3380 3380 0 0.0
.rodata 78739 78739 0 0.0
.text 561760 561752 -8 -0.0
lock-ftd LP_CC2652R7 (read only) 678119 678119 0 0.0
(read/write) 170584 170584 0 0.0
.bss 78484 78484 0 0.0
.data 3304 3304 0 0.0
.rodata 77287 77287 0 0.0
.text 600352 600352 0 0.0
lock-mtd LP_CC2652R7 (read only) 661947 661939 -8 -0.0
(read/write) 182444 182452 8 0.0
.bss 74172 74172 0 0.0
.data 3304 3304 0 0.0
.rodata 103123 103123 0 0.0
.text 558344 558336 -8 -0.0
pump-app LP_CC2652R7 (read only) 687283 687275 -8 -0.0
(read/write) 162124 162132 8 0.0
.bss 78420 78420 0 0.0
.data 3296 3296 0 0.0
.rodata 90507 90507 0 0.0
.text 596292 596284 -8 -0.0
pump-controller-app LP_CC2652R7 (read only) 671775 671775 0 0.0
(read/write) 177744 177744 0 0.0
.bss 78532 78532 0 0.0
.data 3292 3292 0 0.0
.rodata 86063 86063 0 0.0
.text 585232 585232 0 0.0
shell LP_CC2652R7 (read only) 667574 667574 0 0.0
(read/write) 186272 186272 0 0.0
.bss 83540 83540 0 0.0
.data 3376 3376 0 0.0
.rodata 86302 86302 0 0.0
.text 580956 580956 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587322 587322 0 0.0
.app_xip_area 463980 463980 0 0.0
.bss 65776 65776 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) 594378 594378 0 0.0
.app_xip_area 465708 465708 0 0.0
.bss 71096 71096 0 0.0
.data 752 752 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543306 543306 0 0.0
.app_xip_area 424988 424988 0 0.0
.bss 60784 60784 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) 1110304 1110304 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 971880 971880 0 0.0
BRD4161A+rpc (read/write) 973444 973428 -16 -0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 820328 820312 -16 -0.0
BRD4161A+rs911x (read/write) 1003552 1003552 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 832300 832300 0 0.0
lock-app BRD4161A+wf200 (read/write) 1151308 1151308 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 996968 996968 0 0.0
window-app BRD4161A (read/write) 1102352 1102352 0 0.0
.bss 137780 137780 0 0.0
.data 2096 2096 0 0.0
.text 962456 962456 0 0.0
esp32 all-clusters-app c3devkit (read only) 1222906 1222906 0 0.0
(read/write) 1788038 1788038 0 0.0
.dram0.bss 76944 76944 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257608 257608 0 0.0
.flash.text 1222906 1222906 0 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1232935 1232935 0 0.0
(read/write) 563924 563932 8 0.0
.dram0.bss 82304 82304 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314656 314664 8 0.0
.flash.text 1227551 1227551 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 649868 649868 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 574360 574360 0 0.0
lock k32w0+release (read/write) 706824 706824 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 630860 630860 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10352644 10352644 0 0.0
(read/write) 706241 706241 0 0.0
.bss 33937 33937 0 0.0
.data 2864 2864 0 0.0
.data.rel.ro 650560 650560 0 0.0
.dynamic 560 560 0 0.0
.got 13904 13904 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 503812 503812 0 0.0
.text 8194884 8194884 0 0.0
thermostat-no-ble arm64 (read only) 2385420 2385420 0 0.0
(read/write) 143457 143457 0 0.0
.bss 55297 55297 0 0.0
.data 1912 1912 0 0.0
.data.rel.ro 77112 77112 0 0.0
.dynamic 560 560 0 0.0
.got 5160 5160 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 143444 143444 0 0.0
.text 1999968 1999968 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455640 2455640 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1418284 1418284 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1182003 1182003 0 0.0
bss 143633 143633 0 0.0
rodata 144180 144180 0 0.0
text 815244 815244 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160671 1160671 0 0.0
bss 142860 142860 0 0.0
rodata 135768 135768 0 0.0
text 803112 803112 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841968 841968 0 0.0
(read/write) 1743836 1743836 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188712 188712 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1229321 1229321 0 0.0
.debug_aranges 111784 111784 0 0.0
.debug_frame 373216 373216 0 0.0
.debug_info 26811206 26811206 0 0.0
.debug_line 3667609 3667609 0 0.0
.debug_loc 3579706 3579706 0 0.0
.debug_ranges 339888 339888 0 0.0
.debug_str 3438974 3438974 0 0.0
.heap 841968 841968 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 569356 569356 0 0.0
.symtab 421168 421168 0 0.0
.text 0 0 0 0.0
1544072 1544072 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842704 842704 0 0.0
(read/write) 1686476 1686476 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187976 187976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1221120 1221120 0 0.0
.debug_aranges 111256 111256 0 0.0
.debug_frame 376296 376296 0 0.0
.debug_info 26548053 26548055 2 0.0
.debug_line 3688325 3688325 0 0.0
.debug_loc 3567343 3567343 0 0.0
.debug_ranges 338504 338504 0 0.0
.debug_str 3427987 3427987 0 0.0
.heap 842704 842704 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 533445 533445 0 0.0
.symtab 407600 407600 0 0.0
.text 1487448 1487448 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850896 850896 0 0.0
(read/write) 1605060 1605060 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179992 179992 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1055176 1055176 0 0.0
.debug_aranges 103464 103464 0 0.0
.debug_frame 346624 346624 0 0.0
.debug_info 22013489 22013490 1 0.0
.debug_line 3258337 3258337 0 0.0
.debug_loc 3265647 3265647 0 0.0
.debug_ranges 303832 303832 0 0.0
.debug_str 3233519 3233519 0 0.0
.heap 850896 850896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 469822 469822 0 0.0
.symtab 376048 376048 0 0.0
.text 1414224 1414224 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845864 845864 0 0.0
(read/write) 1642668 1642668 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185008 185008 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1062595 1062595 0 0.0
.debug_aranges 104136 104136 0 0.0
.debug_frame 349448 349448 0 0.0
.debug_info 22392810 22392809 -1 -0.0
.debug_line 3267031 3267031 0 0.0
.debug_loc 3305505 3305505 0 0.0
.debug_ranges 307176 307176 0 0.0
.debug_str 3260974 3260974 0 0.0
.heap 845864 845864 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 476025 476025 0 0.0
.symtab 379232 379232 0 0.0
.text 1446800 1446800 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1130796 1130796 0 0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 577892 577892 0 0.0
lock-app qpg6105+debug (read/write) 1101760 1101760 0 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 548860 548860 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 813668 813668 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 574572 574572 0 0.0
lighting-app tlsr9518adk80d (read/write) 835632 835624 -8 -0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 592734 592730 -4 -0.0
ota-requestor-app tlsr9518adk80d (read/write) 843732 843732 0 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 598972 598974 2 0.0

@andy31415
Copy link
Contributor

Will ignore darwin CI errors for the purpose of merging this PR: as this affects TI only, only the TI compilation tests should matter.

@andy31415 andy31415 merged commit 0574c55 into project-chip:master Sep 16, 2022
@bzbarsky-apple bzbarsky-apple mentioned this pull request Sep 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@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

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@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

@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

Assignees
No one assigned
Labels
fast track review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@adabreuti @andy31415