polymachine/b-parasite-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ble] Make advertising non-connectable

Browse source 
I've been debugging a Shelly [bluetooth
proxy](https://www.home-assistant.io/integrations/shelly/#bluetooth-support)
feature, which didn't like b-parasite's advertising. It swallowed it before proxying it to HA.

I compared to both ATC and the legacy b-parasite advertising
(pre-nrf-connect) and found it to be related to the
non-connectable/non-scannable settings. Until this PR, we were
mistankenly settings the advertising to scannable, although with no
scannable data. The Zephyr code that sets this parameter based on the
scannable data is [here](c0fcd35531/subsys/bluetooth/host/adv.c (L860)).

My bet is that some scanners like ESPHome are okay with this, but Shelly
is not. Either way, I believe this PR makes the advertisements more
compliant.
This commit is contained in:
rbaron 2023-04-16 12:28:23 +02:00
parent 9ff5180cd7
commit 7ac6d98b3b
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/nrf-connect/samples/ble/src/ble.c
View file

@ -17,8 +17,6 @@ static const struct bt_data ad[] = {
BT_DATA_BYTES(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME), BT_DATA_BYTES(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME),
}; };
static const struct bt_data sd[] = {};
static bt_addr_le_t mac_addr; static bt_addr_le_t mac_addr;
static int set_user_defined_bt_addr(const char *addr_str) { static int set_user_defined_bt_addr(const char *addr_str) {
@ -58,17 +56,18 @@ int prst_ble_init() {
#define PRST_MS_TO_INTERVAL(value_ms) ((uint16_t)(value_ms) / 0.625f) #define PRST_MS_TO_INTERVAL(value_ms) ((uint16_t)(value_ms) / 0.625f)
int prst_ble_adv_start() { int prst_ble_adv_start() {
// If BT_LE_ADV_NCONN_IDENTITY, this function will advertise with a static MAC
// address programmed in the chip. If BT_LE_ADV_NCONN, this function returns
// advertises with a random MAC each time.
return bt_le_adv_start( return bt_le_adv_start(
BT_LE_ADV_PARAM( BT_LE_ADV_PARAM(
BT_LE_ADV_OPT_USE_IDENTITY, BT_LE_ADV_OPT_USE_IDENTITY,
PRST_MS_TO_INTERVAL(CONFIG_PRST_BLE_MIN_ADV_INTERVAL), PRST_MS_TO_INTERVAL(CONFIG_PRST_BLE_MIN_ADV_INTERVAL),
PRST_MS_TO_INTERVAL(CONFIG_PRST_BLE_MAX_ADV_INTERVAL), PRST_MS_TO_INTERVAL(CONFIG_PRST_BLE_MAX_ADV_INTERVAL),
NULL), /*_peer=*/NULL),
ad, ARRAY_SIZE(ad), sd, ad,
ARRAY_SIZE(sd)); ARRAY_SIZE(ad),
// sd == NULL is required to set advertising to non-connectable. See
// https://github.com/zephyrproject-rtos/zephyr/blob/c0fcd35531611bbe35376c62a9e50744d6904940/subsys/bluetooth/host/adv.c#L860
/*sd=*/NULL,
/*sd_len=*/0);
} }
int prst_ble_adv_stop() { int prst_ble_adv_stop() {