samples: Bluetooth: Broadcast multiple legacy and extended advertising

Update broadcaster_multiple sample to start multiple
advertising sets of type legacy and extended advertising.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

samples/bluetooth/broadcaster_multiple/overlay-bt_ll_sw_split.conf

@@ -0,0 +1,26 @@
+# Increased to 4 gives one each of legacy, 2M, 1M and Coded PHY advertising sets
+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

samples/bluetooth/broadcaster_multiple/prj.conf

@@ -1,23 +1,10 @@
 CONFIG_BT=y
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_EXT_ADV=y
-CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 CONFIG_BT_DEVICE_NAME="Broadcaster Multiple"
-
 CONFIG_LOG=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
+# Require Bluetooth Advertising Extensions Feature
+CONFIG_BT_EXT_ADV=y
 
-# 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_DATA_BUF_MAX=2
+# Increased to 4 gives one each of legacy, 2M, 1M and Coded PHY advertising sets
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2

samples/bluetooth/broadcaster_multiple/sample.yaml

@@ -1,14 +1,24 @@
 sample:
   name: Bluetooth Multiple Extended Advertising Broadcaster
 tests:
-  sample.bluetooth.multiple_broadcast:
+  sample.bluetooth.broadcaster_multiple:
     harness: bluetooth
+    tags: bluetooth
     platform_allow:
       - qemu_cortex_m3
       - qemu_x86
+    integration_platforms:
+      - qemu_cortex_m3
+  sample.bluetooth.broadcaster_multiple.bt_ll_sw_split:
+    harness: bluetooth
+    tags: bluetooth
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    platform_allow:
       - nrf51dk/nrf51822
       - nrf52_bsim
       - nrf52dk/nrf52832
-    tags: bluetooth
+      - nrf52840dk/nrf52840
     integration_platforms:
-      - qemu_cortex_m3
+      - nrf52dk/nrf52832
+      - nrf52840dk/nrf52840

samples/bluetooth/broadcaster_multiple/src/broadcaster_multiple.c

@@ -54,50 +54,105 @@
  */
 static uint8_t mfg_data[BT_MFG_DATA_LEN] = { 0xFF, 0xFF, };
 
-static const struct bt_data ad[] = {
+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)
 {
-	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,
-	};
 	int err;
 
+	/* Create 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[] = {
+			/* 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 */
+		const struct adv_param_config *config =
+			&param_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) {
-			printk("Failed to create advertising set %d (err %d)\n",
-			       index, 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;
+			}
+
+			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, ARRAY_SIZE(ad),
-					     NULL, 0);
+		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);
 			return err;
 		}
+	}
 
+	/* Start Advertising Sets */
+	for (int index = 0; index < CONFIG_BT_EXT_ADV_MAX_ADV_SET; index++) {
 		/* Start extended advertising set */
 		err = bt_le_ext_adv_start(adv[index],
 					  BT_LE_EXT_ADV_START_DEFAULT);

samples/bluetooth/observer/src/observer.c

@@ -9,8 +9,6 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 
-#define NAME_LEN 30
-
 static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
@@ -22,6 +20,8 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 }
 
 #if defined(CONFIG_BT_EXT_ADV)
+#define NAME_LEN 30
+
 static bool data_cb(struct bt_data *data, void *user_data)
 {
 	char *name = user_data;
@@ -86,27 +86,56 @@ static struct bt_le_scan_cb scan_callbacks = {
 };
 #endif /* CONFIG_BT_EXT_ADV */
 
-int observer_start(void)
+static int scan_start(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_LE_SCAN_TYPE_PASSIVE,
+		.type       = BT_LE_SCAN_TYPE_ACTIVE,
 		.options    = BT_LE_SCAN_OPT_FILTER_DUPLICATE,
 		.interval   = BT_GAP_SCAN_FAST_INTERVAL,
 		.window     = BT_GAP_SCAN_FAST_WINDOW,
 	};
 	int err;
 
 #if defined(CONFIG_BT_EXT_ADV)
-	bt_le_scan_cb_register(&scan_callbacks);
-	printk("Registered scan callbacks\n");
+	scan_param.options |= BT_LE_SCAN_OPT_CODED;
 #endif /* CONFIG_BT_EXT_ADV */
 
+scan_start_retry:
+	printk("Starting scanning...\n");
 	err = bt_le_scan_start(&scan_param, device_found);
 	if (err) {
+		if ((scan_param.options & BT_LE_SCAN_OPT_CODED) != 0U) {
+			printk("Failed to start scanning with Coded PHY (err %d), retrying "
+			       "without...\n", err);
+
+			scan_param.options &= ~BT_LE_SCAN_OPT_CODED;
+
+			goto scan_start_retry;
+		}
+
 		printk("Start scanning failed (err %d)\n", err);
+
+		return err;
+	}
+
+	printk("success.\n");
+
+	return 0;
+}
+
+int observer_start(void)
+{
+	int err;
+
+#if defined(CONFIG_BT_EXT_ADV)
+	bt_le_scan_cb_register(&scan_callbacks);
+	printk("Registered scan callbacks\n");
+#endif /* CONFIG_BT_EXT_ADV */
+
+	err = scan_start();
+	if (err != 0) {
 		return err;
 	}
-	printk("Started scanning...\n");
 
 	return 0;
 }

tests/bsim/bluetooth/host/adv/chain/prj.conf

@@ -1,12 +1,14 @@
 CONFIG_BT=y
+
+# Broadcaster
 CONFIG_BT_BROADCASTER=y
-CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
-CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=4
 CONFIG_BT_DEVICE_NAME="Broadcaster Multiple"
 
 # Enable Advertising Data chaining in Zephyr Bluetooth LE Controller
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
 CONFIG_BT_CTLR_ADV_DATA_CHAIN=y
 
 # Zephyr Bluetooth LE Controller will need to use chain PDUs when AD data
@@ -22,19 +24,36 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
 # 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_ADV_DATA_BUF_MAX=2
+CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
+
+# Enable Coded PHY
+CONFIG_BT_CTLR_PHY_CODED=y
+
+# Observer
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_EXT_ADV=y
 
 # Maximum Extended Scanning buffer size
 CONFIG_BT_EXT_SCAN_BUF_SIZE=1650
 
-# Set maximum scan data length for Extended Scanning in Bluetooth LE Controller
-CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
-
 # The Zephyr Controller does not combine all the 1650 bytes before
 # fragmenting into 8 HCI reports, if a PDU has 255 bytes,
 # it will generate 2 HCI reports and so we need to reserve 16 buffers
 CONFIG_BT_BUF_EVT_RX_COUNT=16
 
+# Set maximum scan data length for Extended Scanning in Bluetooth LE Controller
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
+
 # Increase Zephyr Bluetooth LE Controller Rx buffer to receive complete chain
 # of PDUs
 CONFIG_BT_CTLR_RX_BUFFERS=9
+
+# Enable scanning interleaved extended advertising in Zephyr Bluetooth LE
+# Controller
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_SCAN_AUX_SET=3
+CONFIG_BT_CTLR_LOW_LAT_ULL=y
+# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
+# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
+CONFIG_BT_CTLR_SCAN_UNRESERVED=y
+# CONFIG_BT_TICKER_EXT_EXPIRE_INFO=y

tests/bsim/bluetooth/host/adv/chain/src/main.c

@@ -27,6 +27,11 @@
 				      BT_AD_DATA_MFG_DATA_SIZE + BT_AD_DATA_MFG_DATA_SIZE), \
 				     CONFIG_BT_CTLR_ADV_DATA_LEN_MAX)
 
+/* One less extended advertising set as first one is legacy advertising in the broadcaster_multiple
+ * sample.
+ */
+#define BT_EXT_ADV_MAX_ADV_SET (CONFIG_BT_EXT_ADV_MAX_ADV_SET - 1)
+
 static K_SEM_DEFINE(sem_recv, 0, 1);
 
 static void test_adv_main(void)
@@ -76,7 +81,7 @@ static bool data_cb(struct bt_data *data, void *user_data)
 static void scan_recv(const struct bt_le_scan_recv_info *info,
 		      struct net_buf_simple *buf)
 {
-	static uint8_t sid[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
+	static uint8_t sid[BT_EXT_ADV_MAX_ADV_SET];
 	static uint8_t sid_count;
 	char name[NAME_LEN];
 	uint8_t data_status;
@@ -110,7 +115,7 @@ static void scan_recv(const struct bt_le_scan_recv_info *info,
 
 	sid[sid_count++] = info->sid;
 
-	if (sid_count < CONFIG_BT_EXT_ADV_MAX_ADV_SET) {
+	if (sid_count < BT_EXT_ADV_MAX_ADV_SET) {
 		printk("Received advertising sets: %d\n", sid_count);
 		return;
 	}