samples: Bluetooth: Broadcast multiple legacy and extended advertising #94304
+317
−106
There are no files selected for viewing
|
Contributor
Author
There was a problem hiding this comment. Rename this file to cc @nordicjm |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,30 @@ | ||||||||||
| # Increased to 4 gives one each of legacy, 2M, 1M and Coded PHY advertising sets | ||||||||||
|
There was a problem hiding this comment. Typo in comment: "gives" should be "give" (subject-verb agreement with "Increased to 4").
Suggested change
There was a problem hiding this comment. The comment incorrectly states "Increased to 4" when the value is being set for the first time in this new file. This should say "Set to 4" or "Value of 4" to accurately describe the configuration.
Suggested change
|
||||||||||
| CONFIG_BT_EXT_ADV_MAX_ADV_SET=4 | ||||||||||
|
|
||||||||||
| # Use Zephyr Bluetooth Low Energy Controller | ||||||||||
| CONFIG_BT_LL_SW_SPLIT=y | ||||||||||
|
|
||||||||||
| # Enable Coded PHY support in Zephyr Controller, if testing 4 advertising sets | ||||||||||
| CONFIG_BT_CTLR_PHY_CODED=y | ||||||||||
|
|
||||||||||
| # Zephyr Bluetooth LE Controller will need to use chain PDUs when AD data | ||||||||||
| # length > 191 bytes | ||||||||||
| # - 31 bytes will use 22 bytes for the default name in this sample plus 9 bytes | ||||||||||
| # for manufacturer data | ||||||||||
| # - 191 bytes will use 22 bytes for the default name in this sample plus 169 | ||||||||||
| # bytes for manufacturer data | ||||||||||
| # - 277 bytes will use 22 bytes for the default name in this sample plus 255 | ||||||||||
| # bytes for manufacturer data | ||||||||||
| CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=192 | ||||||||||
|
|
||||||||||
| # Increase Advertising PDU buffers to number of advertising sets times the | ||||||||||
| # number of chain PDUs per advertising set when using Zephyr Bluetooth LE | ||||||||||
| # Controller | ||||||||||
| CONFIG_BT_CTLR_ADVANCED_FEATURES=y | ||||||||||
| CONFIG_BT_CTLR_ADV_RESERVE_MAX=n | ||||||||||
| CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 | ||||||||||
| CONFIG_BT_CTLR_ADV_DATA_CHAIN=y | ||||||||||
|
|
||||||||||
| # Code size reduction | ||||||||||
| CONFIG_ISR_TABLES_LOCAL_DECLARATION=y | ||||||||||
| CONFIG_LTO=y | ||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,23 +1,13 @@ | ||||||
| CONFIG_BT=y | ||||||
| CONFIG_BT_BROADCASTER=y | ||||||
| CONFIG_BT_DEVICE_NAME="Broadcaster Multiple" | ||||||
| CONFIG_LOG=y | ||||||
|
|
||||||
| # Require Bluetooth Advertising Extensions Feature | ||||||
| CONFIG_BT_EXT_ADV=y | ||||||
|
|
||||||
| # Two advertising sets should be supported by most Controller implementations with Advertising | ||||||
| # Extensions support. | ||||||
| # Increasing to 4 should gives one each of legacy, 2M, 1M and Coded PHY advertising sets, when | ||||||
| # supported by Controller implementation. | ||||||
| CONFIG_BT_EXT_ADV_MAX_ADV_SET=2 | ||||||
|
There was a problem hiding this comment. The comment on line 9 mentions '4 gives one each of legacy, 2M, 1M and Coded PHY advertising sets' but the configuration is set to 2, creating a mismatch between documentation and actual value.
Suggested change
Contributor
Author
There was a problem hiding this comment. No not all vendors will support 4 as default.
Contributor
There was a problem hiding this comment. I think the issue is that the comment states "Increased to 4" but the option assigns 2
Contributor
There was a problem hiding this comment. @cvinayak did you forget to push? Comment still says
Contributor
Author
Contributor
There was a problem hiding this comment. I still don't think the comment makes a lot of sense. Why is the comment even mentioning 4 sets, if we are configuring for 2 sets?
Contributor
Author
There was a problem hiding this comment. Have added: |
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,24 @@ | ||
| sample: | ||
| name: Bluetooth Multiple Extended Advertising Broadcaster | ||
| common: | ||
| harness: bluetooth | ||
| tags: | ||
| - bluetooth | ||
| tests: | ||
| sample.bluetooth.broadcaster_multiple: | ||
| platform_allow: | ||
| - qemu_cortex_m3 | ||
| - qemu_x86 | ||
| integration_platforms: | ||
| - qemu_cortex_m3 | ||
| sample.bluetooth.broadcaster_multiple.bt_ll_sw_split: | ||
| extra_args: | ||
| - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf | ||
| platform_allow: | ||
| - nrf51dk/nrf51822 | ||
| - nrf52_bsim | ||
| - nrf52dk/nrf52832 | ||
| - nrf52840dk/nrf52840 | ||
| integration_platforms: | ||
| - nrf52dk/nrf52832 | ||
| - nrf52840dk/nrf52840 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -54,44 +54,95 @@ | |||||||||||||||||||
| */ | ||||||||||||||||||||
| static uint8_t mfg_data[BT_MFG_DATA_LEN] = { 0xFF, 0xFF, }; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| static const struct bt_data ad_long[] = { | ||||||||||||||||||||
| BT_DATA(BT_DATA_MANUFACTURER_DATA, mfg_data, sizeof(mfg_data)), | ||||||||||||||||||||
| #if CONFIG_BT_CTLR_ADV_DATA_LEN_MAX > 255 | ||||||||||||||||||||
| BT_DATA(BT_DATA_MANUFACTURER_DATA, mfg_data, sizeof(mfg_data)), | ||||||||||||||||||||
| #endif | ||||||||||||||||||||
| BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), | ||||||||||||||||||||
| }; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| static const struct bt_data ad_short[] = { | ||||||||||||||||||||
| BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), | ||||||||||||||||||||
| }; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| static struct bt_le_ext_adv *adv[CONFIG_BT_EXT_ADV_MAX_ADV_SET]; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| int broadcaster_multiple(void) | ||||||||||||||||||||
| { | ||||||||||||||||||||
| int err; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /* Create and start Advertising Sets */ | ||||||||||||||||||||
| for (int index = 0; index < CONFIG_BT_EXT_ADV_MAX_ADV_SET; index++) { | ||||||||||||||||||||
| struct bt_le_adv_param adv_param = { | ||||||||||||||||||||
| .id = BT_ID_DEFAULT, | ||||||||||||||||||||
| .sid = 0U, /* Supply unique SID when creating advertising set */ | ||||||||||||||||||||
| .secondary_max_skip = 0U, | ||||||||||||||||||||
| .options = BT_LE_ADV_OPT_EXT_ADV, | ||||||||||||||||||||
| .interval_min = BT_GAP_ADV_FAST_INT_MIN_2, | ||||||||||||||||||||
| .interval_max = BT_GAP_ADV_FAST_INT_MAX_2, | ||||||||||||||||||||
| .peer = NULL, | ||||||||||||||||||||
| }; | ||||||||||||||||||||
| const struct adv_param_config { | ||||||||||||||||||||
| uint32_t options; | ||||||||||||||||||||
| const struct bt_data *ad; | ||||||||||||||||||||
| size_t ad_size; | ||||||||||||||||||||
| } param_config[] = { | ||||||||||||||||||||
|
Comment on lines
+86
to
+90
There was a problem hiding this comment. [nitpick] The struct |
||||||||||||||||||||
| { /* Use 1M legacy PDU */ | ||||||||||||||||||||
| .options = BT_LE_ADV_OPT_NONE, | ||||||||||||||||||||
| .ad = ad_short, | ||||||||||||||||||||
| .ad_size = ARRAY_SIZE(ad_short), | ||||||||||||||||||||
| }, | ||||||||||||||||||||
| { /* Use 2M auxiliary PDU */ | ||||||||||||||||||||
| .options = BT_LE_ADV_OPT_EXT_ADV, | ||||||||||||||||||||
| .ad = ad_long, | ||||||||||||||||||||
| .ad_size = ARRAY_SIZE(ad_long), | ||||||||||||||||||||
| }, | ||||||||||||||||||||
| { /* Use 1M auxiliary PDU */ | ||||||||||||||||||||
| .options = BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_NO_2M, | ||||||||||||||||||||
| .ad = ad_long, | ||||||||||||||||||||
| .ad_size = ARRAY_SIZE(ad_long), | ||||||||||||||||||||
| }, | ||||||||||||||||||||
| { /* Use Coded PHY */ | ||||||||||||||||||||
| .options = BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_CODED, | ||||||||||||||||||||
| .ad = ad_long, | ||||||||||||||||||||
| .ad_size = ARRAY_SIZE(ad_long), | ||||||||||||||||||||
| }}; | ||||||||||||||||||||
| const struct bt_data *ad; | ||||||||||||||||||||
| size_t ad_size; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /* Use advertising set instance index as SID */ | ||||||||||||||||||||
| adv_param.sid = index; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /* Advertising set options, AD and AD array size */ | ||||||||||||||||||||
|
There was a problem hiding this comment. Using modulo operation to cycle through configurations could be confusing when
Suggested change
|
||||||||||||||||||||
| const struct adv_param_config *config = | ||||||||||||||||||||
| ¶m_config[index % ARRAY_SIZE(param_config)]; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| adv_param.options = config->options; | ||||||||||||||||||||
| ad = config->ad; | ||||||||||||||||||||
| ad_size = config->ad_size; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| ext_adv_create_retry: | ||||||||||||||||||||
| /* Create a non-connectable advertising set */ | ||||||||||||||||||||
| err = bt_le_ext_adv_create(&adv_param, NULL, &adv[index]); | ||||||||||||||||||||
| if (err) { | ||||||||||||||||||||
| /* Failed creating Coded PHY advertising set? */ | ||||||||||||||||||||
| if ((adv_param.options & BT_LE_ADV_OPT_CODED) != 0U) { | ||||||||||||||||||||
| printk("Failed to create advertising set %d with Coded PHY " | ||||||||||||||||||||
| "(err %d), retry without...\n", index, err); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /* Retry with non-Coded PHY advertising set */ | ||||||||||||||||||||
| adv_param.options &= ~BT_LE_ADV_OPT_CODED; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| goto ext_adv_create_retry; | ||||||||||||||||||||
|
Check failure on line 137 in samples/bluetooth/broadcaster_multiple/src/broadcaster_multiple.c
|
||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| printk("Failed to create advertising set %d (err %d)\n", index, err); | ||||||||||||||||||||
| return err; | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /* Set extended advertising data */ | ||||||||||||||||||||
| err = bt_le_ext_adv_set_data(adv[index], ad, ad_size, NULL, 0); | ||||||||||||||||||||
| if (err) { | ||||||||||||||||||||
| printk("Failed to set advertising data for set %d " | ||||||||||||||||||||
| "(err %d)\n", index, err); | ||||||||||||||||||||
|
|
||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Contributor
Author
There was a problem hiding this comment. Rename this file to cc @nordicjm |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Contributor
Author
There was a problem hiding this comment. Rename this file to cc @nordicjm |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove
overlayfrom name, overlay terminology is for DT (I know there are other files named that way, but it's wrong).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is followed across the net, drivers and bluetooth subsystem... and KConfig settings too refer to
applications can have SoC overlay configuration that is applied to itor phrase likeoverlay configuration fileshere: https://docs.zephyrproject.org/latest/build/kconfig/setting.htmlHence, outside the scope of this PR. You may request a github issue to update rest of the repository and Kconfig settings documentation with a suitable proposal.