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

[Ameba] Fix BLE advertising interval #19751

Merged
merged 2 commits into from
Jun 22, 2022
Merged

[Ameba] Fix BLE advertising interval #19751

merged 2 commits into from
Jun 22, 2022

Conversation

pankore
Copy link
Contributor

@pankore pankore commented Jun 20, 2022

Problem

Ameba's current BLE advertising is not spec-compliant
According to specs, BLE advertising interval should follow below rules.

  • T=0 to T=30s, interval should be between 20ms to 60ms
  • T=30s to T=15min, interval should be between 150ms to 1200ms
  • Stop ble adv after 15min

Change overview

  • Start timer when SetAdvertisingEnabled is called
  • Added methods to handle 30s-timer and 15min-timer
  • Set relevant flags in the timer handlers before calling DriveBLEState

Testing

Checked BLE adv intervals using nrfconnect app

@pankore
[BLE] Fix BLE advertising interval
c80af5c 
- T=0 to T=30, interval should be between 20ms to 60ms
- T=30 to T=15min, interval should be between 150ms to 1200ms
- Stop ble adv after 15min

- Start timer when SetAdvertisingEnabled is called
- Added methods to handle 30s-timer and 15min-timer
- Set relevant flags in the timer handlers before calling DriveBLEState
@github-actions
Copy link

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

PR #19751: Size comparison from c60233d to c80af5c

Increases (3 builds for cyw30739, nrfconnect, telink)
platform target config section c60233d c80af5c change % change
cyw30739 light cyw930739m2evb_01 (read/write) 612726 612734 8 0.0
.app_xip_area 469392 469400 8 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198715 16 0.0
text 822516 822520 4 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789064 789072 8 0.0
text 559656 559658 2 0.0
Decreases (1 build for esp32)
platform target config section c60233d c80af5c change % change
esp32 all-clusters-app c3devkit (read only) 1012944 1012942 -2 -0.0
.flash.text 1012944 1012942 -2 -0.0
Full report (30 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section c60233d c80af5c change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 659527 659527 0 0.0
(read/write) 191336 191336 0 0.0
.bss 73756 73756 0 0.0
.data 3356 3356 0 0.0
.rodata 87087 87087 0 0.0
.text 572128 572128 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 648023 648023 0 0.0
(read/write) 157316 157316 0 0.0
.bss 73044 73044 0 0.0
.data 3356 3356 0 0.0
.rodata 90407 90407 0 0.0
.text 557296 557296 0 0.0
lock-ftd LP_CC2652R7 (read only) 690491 690491 0 0.0
(read/write) 150484 150484 0 0.0
.bss 70756 70756 0 0.0
.data 3280 3280 0 0.0
.rodata 99163 99163 0 0.0
.text 590844 590844 0 0.0
lock-mtd LP_CC2652R7 (read only) 639891 639891 0 0.0
(read/write) 143888 143888 0 0.0
.bss 66492 66492 0 0.0
.data 3280 3280 0 0.0
.rodata 99043 99043 0 0.0
.text 540356 540356 0 0.0
pump-app LP_CC2652R7 (read only) 671427 671427 0 0.0
(read/write) 170436 170436 0 0.0
.bss 70876 70876 0 0.0
.data 3280 3280 0 0.0
.rodata 87259 87259 0 0.0
.text 583684 583684 0 0.0
pump-controller-app LP_CC2652R7 (read only) 657319 657319 0 0.0
(read/write) 184656 184656 0 0.0
.bss 70988 70988 0 0.0
.data 3276 3276 0 0.0
.rodata 83103 83103 0 0.0
.text 573736 573736 0 0.0
shell LP_CC2652R7 (read only) 688954 688954 0 0.0
(read/write) 157404 157404 0 0.0
.bss 76052 76052 0 0.0
.data 3360 3360 0 0.0
.rodata 109658 109658 0 0.0
.text 578984 578984 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 612726 612734 8 0.0
.app_xip_area 469392 469400 8 0.0
.bss 86288 86288 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 610090 610090 0 0.0
.app_xip_area 466580 466580 0 0.0
.bss 86464 86464 0 0.0
.data 732 732 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 616090 616090 0 0.0
.app_xip_area 473644 473644 0 0.0
.bss 85456 85456 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 924012 924012 0 0.0
(read/write) 132416 132416 0 0.0
.bss 130336 130336 0 0.0
.data 2080 2080 0 0.0
.text 924004 924004 0 0.0
BRD4161A+rpc (read only) 959716 959716 0 0.0
(read/write) 149292 149292 0 0.0
.bss 147008 147008 0 0.0
.data 2284 2284 0 0.0
.text 959708 959708 0 0.0
BRD4161A+rs911x (read only) 799408 799408 0 0.0
(read/write) 128692 128692 0 0.0
.bss 126604 126604 0 0.0
.data 2088 2088 0 0.0
.text 799400 799400 0 0.0
lock-app BRD4161A+wf200 (read only) 965828 965828 0 0.0
(read/write) 129068 129068 0 0.0
.bss 126980 126980 0 0.0
.data 2088 2088 0 0.0
.text 965820 965820 0 0.0
window-app BRD4161A (read only) 909172 909172 0 0.0
(read/write) 132516 132516 0 0.0
.bss 130408 130408 0 0.0
.data 2108 2108 0 0.0
.text 909164 909164 0 0.0
esp32 all-clusters-app c3devkit (read only) 1012944 1012942 -2 -0.0
(read/write) 1482898 1482898 0 0.0
.dram0.bss 69392 69392 0 0.0
.dram0.data 14632 14632 0 0.0
.flash.rodata 213440 213440 0 0.0
.flash.text 1012944 1012942 -2 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1067419 1067419 0 0.0
(read/write) 485016 485016 0 0.0
.dram0.bss 74912 74912 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 243964 243964 0 0.0
.flash.text 1062035 1062035 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658892 658892 0 0.0
.bss 68756 68756 0 0.0
.data 1992 1992 0 0.0
.text 582344 582344 0 0.0
lock k32w061+release (read/write) 720884 720884 0 0.0
.bss 69196 69196 0 0.0
.data 2000 2000 0 0.0
.text 643888 643888 0 0.0
linux chip-tool-no-interactive-ipv6only arm64 (read only) 9882612 9882612 0 0.0
(read/write) 674225 674225 0 0.0
.bss 42641 42641 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 613208 613208 0 0.0
.dynamic 528 528 0 0.0
.got 13416 13416 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 472324 472324 0 0.0
.text 7873860 7873860 0 0.0
thermostat-no-ble arm64 (read only) 2571484 2571484 0 0.0
(read/write) 192193 192193 0 0.0
.bss 99489 99489 0 0.0
.data 1688 1688 0 0.0
.data.rel.ro 82928 82928 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 163340 163340 0 0.0
.text 2169024 2169024 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2438040 2438040 0 0.0
.bss 208204 208204 0 0.0
.data 5864 5864 0 0.0
.text 1400684 1400684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198715 16 0.0
bss 141598 141598 0 0.0
rodata 155676 155676 0 0.0
text 822516 822520 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1146671 1146671 0 0.0
bss 140850 140850 0 0.0
rodata 132200 132200 0 0.0
text 794740 794740 0 0.0
p6 all-clusters-app default (read/write) 2553880 2553880 0 0.0
.bss 143384 143384 0 0.0
.data 2776 2776 0 0.0
.text 1512144 1512144 0 0.0
all-clusters-minimal-app default (read/write) 2499728 2499728 0 0.0
.bss 142664 142664 0 0.0
.data 2776 2776 0 0.0
.text 1457992 1457992 0 0.0
light-app default (read/write) 2430488 2430488 0 0.0
.bss 134744 134744 0 0.0
.data 2592 2592 0 0.0
.text 1388752 1388752 0 0.0
lock-app default (read/write) 2451184 2451184 0 0.0
.bss 134568 134568 0 0.0
.data 2600 2600 0 0.0
.text 1409448 1409448 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789064 789072 8 0.0
bss 69892 69892 0 0.0
noinit 40416 40416 0 0.0
text 559656 559658 2 0.0
lighting-app tlsr9518adk80d (read/write) 808776 808776 0 0.0
bss 70140 70140 0 0.0
noinit 40416 40416 0 0.0
text 576118 576118 0 0.0

@github-actions
Copy link

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

PR #19751: Size comparison from c60233d to 27d748b

Increases (4 builds for cyw30739, nrfconnect, telink)
platform target config section c60233d 27d748b change % change
cyw30739 light cyw930739m2evb_01 (read/write) 612726 612734 8 0.0
.app_xip_area 469392 469400 8 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198715 16 0.0
text 822516 822520 4 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789064 789072 8 0.0
text 559656 559658 2 0.0
lighting-app tlsr9518adk80d text 576118 576120 2 0.0
Decreases (1 build for cc13x2_26x2)
platform target config section c60233d 27d748b change % change
cc13x2_26x2 all-clusters-minimal-app LP_CC2652R7 (read only) 648023 648015 -8 -0.0
.text 557296 557288 -8 -0.0
Full report (28 builds for cc13x2_26x2, cyw30739, efr32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section c60233d 27d748b change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 659527 659527 0 0.0
(read/write) 191336 191336 0 0.0
.bss 73756 73756 0 0.0
.data 3356 3356 0 0.0
.rodata 87087 87087 0 0.0
.text 572128 572128 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 648023 648015 -8 -0.0
(read/write) 157316 157316 0 0.0
.bss 73044 73044 0 0.0
.data 3356 3356 0 0.0
.rodata 90407 90407 0 0.0
.text 557296 557288 -8 -0.0
lock-ftd LP_CC2652R7 (read only) 690491 690491 0 0.0
(read/write) 150484 150484 0 0.0
.bss 70756 70756 0 0.0
.data 3280 3280 0 0.0
.rodata 99163 99163 0 0.0
.text 590844 590844 0 0.0
lock-mtd LP_CC2652R7 (read only) 639891 639891 0 0.0
(read/write) 143888 143888 0 0.0
.bss 66492 66492 0 0.0
.data 3280 3280 0 0.0
.rodata 99043 99043 0 0.0
.text 540356 540356 0 0.0
pump-app LP_CC2652R7 (read only) 671427 671427 0 0.0
(read/write) 170436 170436 0 0.0
.bss 70876 70876 0 0.0
.data 3280 3280 0 0.0
.rodata 87259 87259 0 0.0
.text 583684 583684 0 0.0
pump-controller-app LP_CC2652R7 (read only) 657319 657319 0 0.0
(read/write) 184656 184656 0 0.0
.bss 70988 70988 0 0.0
.data 3276 3276 0 0.0
.rodata 83103 83103 0 0.0
.text 573736 573736 0 0.0
shell LP_CC2652R7 (read only) 688954 688954 0 0.0
(read/write) 157404 157404 0 0.0
.bss 76052 76052 0 0.0
.data 3360 3360 0 0.0
.rodata 109658 109658 0 0.0
.text 578984 578984 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 612726 612734 8 0.0
.app_xip_area 469392 469400 8 0.0
.bss 86288 86288 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 610090 610090 0 0.0
.app_xip_area 466580 466580 0 0.0
.bss 86464 86464 0 0.0
.data 732 732 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 616090 616090 0 0.0
.app_xip_area 473644 473644 0 0.0
.bss 85456 85456 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 924012 924012 0 0.0
(read/write) 132416 132416 0 0.0
.bss 130336 130336 0 0.0
.data 2080 2080 0 0.0
.text 924004 924004 0 0.0
BRD4161A+rpc (read only) 959716 959716 0 0.0
(read/write) 149292 149292 0 0.0
.bss 147008 147008 0 0.0
.data 2284 2284 0 0.0
.text 959708 959708 0 0.0
BRD4161A+rs911x (read only) 799408 799408 0 0.0
(read/write) 128692 128692 0 0.0
.bss 126604 126604 0 0.0
.data 2088 2088 0 0.0
.text 799400 799400 0 0.0
lock-app BRD4161A+wf200 (read only) 965828 965828 0 0.0
(read/write) 129068 129068 0 0.0
.bss 126980 126980 0 0.0
.data 2088 2088 0 0.0
.text 965820 965820 0 0.0
window-app BRD4161A (read only) 909172 909172 0 0.0
(read/write) 132516 132516 0 0.0
.bss 130408 130408 0 0.0
.data 2108 2108 0 0.0
.text 909164 909164 0 0.0
k32w light k32w061+release (read/write) 658892 658892 0 0.0
.bss 68756 68756 0 0.0
.data 1992 1992 0 0.0
.text 582344 582344 0 0.0
lock k32w061+release (read/write) 720884 720884 0 0.0
.bss 69196 69196 0 0.0
.data 2000 2000 0 0.0
.text 643888 643888 0 0.0
linux chip-tool-no-interactive-ipv6only arm64 (read only) 9882612 9882612 0 0.0
(read/write) 674225 674225 0 0.0
.bss 42641 42641 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 613208 613208 0 0.0
.dynamic 528 528 0 0.0
.got 13416 13416 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 472324 472324 0 0.0
.text 7873860 7873860 0 0.0
thermostat-no-ble arm64 (read only) 2571484 2571484 0 0.0
(read/write) 192193 192193 0 0.0
.bss 99489 99489 0 0.0
.data 1688 1688 0 0.0
.data.rel.ro 82928 82928 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 163340 163340 0 0.0
.text 2169024 2169024 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2438040 2438040 0 0.0
.bss 208204 208204 0 0.0
.data 5864 5864 0 0.0
.text 1400684 1400684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198715 16 0.0
bss 141598 141598 0 0.0
rodata 155676 155676 0 0.0
text 822516 822520 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1146671 1146671 0 0.0
bss 140850 140850 0 0.0
rodata 132200 132200 0 0.0
text 794740 794740 0 0.0
p6 all-clusters-app default (read/write) 2553880 2553880 0 0.0
.bss 143384 143384 0 0.0
.data 2776 2776 0 0.0
.text 1512144 1512144 0 0.0
all-clusters-minimal-app default (read/write) 2499728 2499728 0 0.0
.bss 142664 142664 0 0.0
.data 2776 2776 0 0.0
.text 1457992 1457992 0 0.0
light-app default (read/write) 2430488 2430488 0 0.0
.bss 134744 134744 0 0.0
.data 2592 2592 0 0.0
.text 1388752 1388752 0 0.0
lock-app default (read/write) 2451184 2451184 0 0.0
.bss 134568 134568 0 0.0
.data 2600 2600 0 0.0
.text 1409448 1409448 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789064 789072 8 0.0
bss 69892 69892 0 0.0
noinit 40416 40416 0 0.0
text 559656 559658 2 0.0
lighting-app tlsr9518adk80d (read/write) 808776 808776 0 0.0
bss 70140 70140 0 0.0
noinit 40416 40416 0 0.0
text 576118 576120 2 0.0

@woody-apple
Copy link
Contributor

Fast tracking platform changes

@Damian-Nordic Damian-Nordic merged commit d1a4bb7 into project-chip:master Jun 22, 2022
@pankore pankore deleted the ble_adv_interval_fix branch September 15, 2022 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 Awaiting requested review from andy31415

@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

@hawk248 hawk248 Awaiting requested review from hawk248

@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

@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

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

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

@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

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

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

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

Successfully merging this pull request may close these issues.
3 participants
@pankore @woody-apple @Damian-Nordic