adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

samples: Bluetooth: Update central multilink and peripheral identity

Browse source 
Update central multilink sample to use continuous scanning
to speed up connection setup.

Update peripheral identity sample to be configurable for
bsim testing as multiple devices with configurable count
of supported connections.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-12-13 05:36:32 +01:00 committed by Benjamin Cabé
parent 9b470ad664
commit 5f06511e91
5 changed files with 77 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
samples/bluetooth/central_multilink/src/central_multilink.c
View file

@ -20,8 +20,8 @@
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/sys/byteorder.h>
#define SCAN_INTERVAL 0x0640 /* 1000 ms */
#define SCAN_WINDOW 0x0030 /* 30 ms */
#define SCAN_INTERVAL 0x0010 /* 10 ms */
#define SCAN_WINDOW 0x0010 /* 10 ms */
#define INIT_INTERVAL 0x0010 /* 10 ms */
#define INIT_WINDOW 0x0010 /* 10 ms */
#define CONN_INTERVAL 0x0320 /* 1000 ms */
@ -32,6 +32,7 @@
static void start_scan(void);
static struct bt_conn *conn_connecting;
static uint8_t conn_count_max;
static uint8_t volatile conn_count;
static bool volatile is_disconnecting;
@ -157,7 +158,7 @@ static void connected(struct bt_conn *conn, uint8_t reason)
conn_connecting = NULL;
conn_count++;
if (conn_count < CONFIG_BT_MAX_CONN) {
if (conn_count < conn_count_max) {
start_scan();
}
@ -186,7 +187,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
bt_conn_unref(conn);
if ((conn_count == 1U) && is_disconnecting) {
if ((conn_count == 1U) && (is_disconnecting || (reason == BT_HCI_ERR_CONN_FAIL_TO_ESTAB))) {
is_disconnecting = false;
start_scan();
}
@ -291,14 +292,17 @@ static void disconnect(struct bt_conn *conn, void *data)
err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
if (err) {
printk("Failed disconnection %s.\n", addr);
return;
}
printk("success.\n");
}
int init_central(uint8_t iterations)
int init_central(uint8_t max_conn, uint8_t iterations)
{
int err;
conn_count_max = max_conn;
err = bt_enable(NULL);
if (err) {
printk("Bluetooth init failed (err %d)\n", err);
@ -312,10 +316,15 @@ int init_central(uint8_t iterations)
start_scan();
while (true) {
while (conn_count < CONFIG_BT_MAX_CONN) {
while (conn_count < conn_count_max) {
k_sleep(K_MSEC(10));
}
is_disconnecting = true;
/* Lets wait sufficiently to ensure a stable connection
* before starting to disconnect for next iteration.
*/
k_sleep(K_SECONDS(60));
if (!iterations) {
@ -324,9 +333,15 @@ int init_central(uint8_t iterations)
iterations--;
printk("Iterations remaining: %u\n", iterations);
/* Device needing multiple connections is the one
* initiating the disconnects.
*/
if (conn_count_max > 1U) {
printk("Disconnecting all...\n");
is_disconnecting = true;
bt_conn_foreach(BT_CONN_TYPE_LE, disconnect, NULL);
} else {
printk("Wait for disconnections...\n");
}
while (is_disconnecting) {
k_sleep(K_MSEC(10));

4
samples/bluetooth/central_multilink/src/main.c
View file

@ -8,10 +8,10 @@
#include <stdint.h>
int init_central(uint8_t iterations);
int init_central(uint8_t max_conn, uint8_t iterations);
int main(void)
{
(void)init_central(CONFIG_SAMPLE_CONN_ITERATIONS);
(void)init_central(CONFIG_BT_MAX_CONN, CONFIG_SAMPLE_CONN_ITERATIONS);
return 0;
}

4
samples/bluetooth/peripheral_identity/src/main.c
View file

@ -8,10 +8,10 @@
#include <stdint.h>
int init_peripheral(uint8_t iterations);
int init_peripheral(uint8_t max_conn, uint8_t iterations);
int main(void)
{
(void)init_peripheral(CONFIG_SAMPLE_CONN_ITERATIONS);
(void)init_peripheral(CONFIG_BT_MAX_CONN, CONFIG_SAMPLE_CONN_ITERATIONS);
return 0;
}

52
samples/bluetooth/peripheral_identity/src/peripheral_identity.c
View file

@ -15,6 +15,7 @@
#include <zephyr/bluetooth/hci.h>
static struct k_work work_adv_start;
static uint8_t conn_count_max;
static uint8_t volatile conn_count;
static uint8_t id_current;
static bool volatile is_disconnecting;
@ -49,7 +50,7 @@ static void adv_start(struct k_work *work)
if (id < 0) {
printk("Create id failed (%d)\n", id);
if (id_current == 0) {
id_current = CONFIG_BT_MAX_CONN;
id_current = conn_count_max;
}
id_current--;
} else {
@ -67,7 +68,7 @@ static void adv_start(struct k_work *work)
}
id_current++;
if (id_current == CONFIG_BT_MAX_CONN) {
if (id_current == conn_count_max) {
id_current = 0;
}
@ -84,7 +85,7 @@ static void connected(struct bt_conn *conn, uint8_t err)
}
conn_count++;
if (conn_count < CONFIG_BT_MAX_CONN) {
if (conn_count < conn_count_max) {
k_work_submit(&work_adv_start);
}
@ -225,11 +226,29 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
}
#endif /* CONFIG_BT_OBSERVER */
int init_peripheral(uint8_t iterations)
static void disconnect(struct bt_conn *conn, void *data)
{
char addr[BT_ADDR_LE_STR_LEN];
int err;
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
printk("Disconnecting %s...\n", addr);
err = bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
if (err) {
printk("Failed disconnection %s.\n", addr);
return;
}
printk("success.\n");
}
int init_peripheral(uint8_t max_conn, uint8_t iterations)
{
size_t id_count;
int err;
conn_count_max = max_conn;
err = bt_enable(NULL);
if (err) {
printk("Bluetooth init failed (err %d)\n", err);
@ -264,7 +283,7 @@ int init_peripheral(uint8_t iterations)
id_count = 0xFF;
bt_id_get(NULL, &id_count);
} while (id_count != CONFIG_BT_MAX_CONN);
} while (id_count != conn_count_max);
/* rotate identities so reconnections are attempted in case of any
* disconnections
@ -272,17 +291,31 @@ int init_peripheral(uint8_t iterations)
uint8_t prev_count = conn_count;
while (1) {
/* If maximum connections is reached, wait for disconnections
* initiated by peer central devices.
*/
if (conn_count == CONFIG_BT_MAX_CONN) {
if (conn_count == conn_count_max) {
is_disconnecting = true;
/* Lets wait sufficiently to ensure a stable connection
* before starting to disconnect for next iteration.
*/
k_sleep(K_SECONDS(60));
if (!iterations) {
break;
}
iterations--;
printk("Iterations remaining: %u\n", iterations);
/* Device needing multiple connections is the one
* initiating the disconnects.
*/
if (conn_count_max > 1U) {
printk("Disconnecting all...\n");
bt_conn_foreach(BT_CONN_TYPE_LE, disconnect, NULL);
} else {
printk("Wait for disconnections...\n");
is_disconnecting = true;
}
while (is_disconnecting) {
k_sleep(K_MSEC(10));
}
@ -306,6 +339,9 @@ int init_peripheral(uint8_t iterations)
* connections plus few seconds of margin.
*/
while ((prev_count == conn_count) && wait) {
printk("Waiting connections (%u/%u) %u...\n",
prev_count, conn_count, wait);
wait--;
k_sleep(K_MSEC(10));

8
tests/bsim/bluetooth/ll/multiple_id/src/main.c
View file

@ -25,8 +25,8 @@
*/
#define ITERATIONS 2
int init_central(uint8_t iterations);
int init_peripheral(uint8_t iterations);
int init_central(uint8_t max_conn, uint8_t iterations);
int init_peripheral(uint8_t max_conn, uint8_t iterations);
#define FAIL(...) \
do { \
@ -46,7 +46,7 @@ static void test_central_main(void)
{
int err;
err = init_central(ITERATIONS);
err = init_central(CONFIG_BT_MAX_CONN, ITERATIONS);
if (err) {
goto exit;
}
@ -70,7 +70,7 @@ static void test_peripheral_main(void)
{
int err;
err = init_peripheral(ITERATIONS);
err = init_peripheral(CONFIG_BT_MAX_CONN, ITERATIONS);
if (err) {
goto exit;
}