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/prj.conf

@@ -1,10 +1,16 @@
 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
+
+# Increase to 4 gives one each of legacy, 2M, 1M and Coded PHY advertising sets
 CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
-CONFIG_BT_DEVICE_NAME="Broadcaster Multiple"
 
-CONFIG_LOG=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
@@ -20,4 +26,6 @@ CONFIG_LOG=y
 # 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
+# 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/src/broadcaster_multiple.c

@@ -54,14 +54,18 @@
  */
 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)
@@ -78,20 +82,56 @@ int broadcaster_multiple(void)
 	int err;
 
 	for (int index = 0; index < CONFIG_BT_EXT_ADV_MAX_ADV_SET; index++) {
+		const struct bt_data *ad;
+		size_t ad_size;
+
 		/* Use advertising set instance index as SID */
 		adv_param.sid = index;
 
+		/* Use Coded PHY */
+		if ((index % 4) == 3) {
+			adv_param.options = BT_LE_ADV_OPT_EXT_ADV;
+			adv_param.options |= BT_LE_ADV_OPT_CODED;
+			ad = ad_long;
+			ad_size = ARRAY_SIZE(ad_long);
+		/* Use 1M auxiliary PDU */
+		} else if ((index % 4) == 2) {
+			adv_param.options = BT_LE_ADV_OPT_EXT_ADV;
+			adv_param.options |= BT_LE_ADV_OPT_NO_2M;
+			ad = ad_long;
+			ad_size = ARRAY_SIZE(ad_long);
+		/* Use 2M auxiliary PDU */
+		} else if ((index % 4) == 1) {
+			adv_param.options = BT_LE_ADV_OPT_EXT_ADV;
+			ad = ad_long;
+			ad_size = ARRAY_SIZE(ad_long);
+		/* Use 1M legacy PDU */
+		} else {
+			adv_param.options = BT_LE_ADV_OPT_NONE;
+			ad = ad_short;
+			ad_size = ARRAY_SIZE(ad_short);
+		}
+
+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) {
+				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);

samples/bluetooth/observer/src/observer.c

@@ -99,13 +99,27 @@ int observer_start(void)
 #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:
 	err = bt_le_scan_start(&scan_param, device_found);
 	if (err) {
+		if (scan_param.options & BT_LE_SCAN_OPT_CODED) {
+			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("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
@@ -24,17 +26,34 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=1650
 # Controller
 CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2
 
+# 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=9
+CONFIG_BT_CTLR_LOW_LAT_ULL=y
+# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
+# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=9
+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;
 	}

tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh

@@ -18,6 +18,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_chain_prj_conf\
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=scan
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=10e6 $@
+  -D=2 -sim_length=11e6 $@
 
 wait_for_background_jobs