7ac6d98b3b
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.
80 lines
No EOL
2.4 KiB
C
80 lines
No EOL
2.4 KiB
C
#include "ble.h"
|
|
|
|
#include <prstlib/macros.h>
|
|
#include <zephyr/bluetooth/bluetooth.h>
|
|
#include <zephyr/logging/log.h>
|
|
#include <zephyr/settings/settings.h>
|
|
|
|
#include "encoding.h"
|
|
|
|
LOG_MODULE_REGISTER(ble, LOG_LEVEL_INF);
|
|
|
|
static uint8_t service_data[CONFIG_PRST_BLE_ENCODING_SERVICE_DATA_LEN] = {0};
|
|
|
|
static const struct bt_data ad[] = {
|
|
BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
|
|
BT_DATA(BT_DATA_SVC_DATA16, service_data, ARRAY_SIZE(service_data)),
|
|
BT_DATA_BYTES(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME),
|
|
};
|
|
|
|
static bt_addr_le_t mac_addr;
|
|
|
|
static int set_user_defined_bt_addr(const char *addr_str) {
|
|
bt_addr_le_t addr;
|
|
RET_IF_ERR(bt_addr_le_from_str(addr_str, "random", &addr));
|
|
RET_IF_ERR(bt_id_create(&addr, NULL));
|
|
return 0;
|
|
}
|
|
|
|
// bt_addr_le_t.a holds the MAC address in big-endian.
|
|
static int get_mac_addr(bt_addr_le_t *out) {
|
|
struct bt_le_oob oob;
|
|
RET_IF_ERR(bt_le_oob_get_local(BT_ID_DEFAULT, &oob));
|
|
const uint8_t *addr = oob.addr.a.val;
|
|
LOG_INF("MAC Address: %02x:%02x:%02x:%02x:%02x:%02x",
|
|
addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
|
|
*out = oob.addr;
|
|
return 0;
|
|
}
|
|
|
|
int prst_ble_init() {
|
|
#if CONFIG_PRST_BLE_HAS_USER_DEFINED_RANDOM_STATIC_ADDR
|
|
RET_IF_ERR(set_user_defined_bt_addr(CONFIG_PRST_BLE_USER_DEFINED_RANDOM_STATIC_ADDR));
|
|
#else
|
|
UNUSED_OK(set_user_defined_bt_addr);
|
|
#endif // PRST_BLE_HAS_USER_DEFINED_MAC_ADDR
|
|
|
|
RET_IF_ERR(bt_enable(/*bt_reader_cb_t=*/NULL));
|
|
if (IS_ENABLED(CONFIG_SETTINGS)) {
|
|
RET_IF_ERR_MSG(settings_load(), "Error in settings_load()");
|
|
}
|
|
|
|
RET_IF_ERR(get_mac_addr(&mac_addr));
|
|
return 0;
|
|
}
|
|
|
|
#define PRST_MS_TO_INTERVAL(value_ms) ((uint16_t)(value_ms) / 0.625f)
|
|
|
|
int prst_ble_adv_start() {
|
|
return bt_le_adv_start(
|
|
BT_LE_ADV_PARAM(
|
|
BT_LE_ADV_OPT_USE_IDENTITY,
|
|
PRST_MS_TO_INTERVAL(CONFIG_PRST_BLE_MIN_ADV_INTERVAL),
|
|
PRST_MS_TO_INTERVAL(CONFIG_PRST_BLE_MAX_ADV_INTERVAL),
|
|
/*_peer=*/NULL),
|
|
ad,
|
|
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() {
|
|
return bt_le_adv_stop();
|
|
}
|
|
|
|
int prst_ble_adv_set_data(const prst_sensors_t *sensors) {
|
|
return prst_ble_encode_service_data(sensors, &mac_addr, service_data,
|
|
sizeof(service_data));
|
|
} |