espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-05 14:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/mesh: Minor fix name for mesh advertising instance and idx

Browse Source 
Make sure we use GATT and ADV bearer
This commit is contained in:
Łukasz Rymanowski
2018-05-22 23:47:32 +02:00
parent 8aaf05cc9f
commit 12f3d059cd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/glue.c
+7 -6
View File
@@ -32,15 +32,16 @@
#if MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) < 1
#error "Mesh needs at least BLE_MULTI_ADV_INSTANCES set to 1"
#endif
#define BT_MESH_ADV_PROXY_INST (MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) - 1)
#define BT_MESH_ADV_GATT_INST (MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) - 1)
#endif /* BLE_MESH_PROXY */
#endif /* BLE_EXT_ADV */
extern u8_t g_mesh_addr_type;
#if MYNEWT_VAL(BLE_EXT_ADV)
#define BLE_ADV_PB_ADV_IDX (0)
#define BLE_ADV_PB_GATT_IDX (1)
/* Store configuration for different bearers */
#define BT_MESH_ADV_IDX (0)
#define BT_MESH_GATT_IDX (1)
static struct ble_gap_adv_params ble_adv_cur_conf[2];
#endif
@@ -522,11 +523,11 @@ ble_adv_conf_adv_instance(const struct ble_gap_adv_params *param, int *instance)
if (param->conn_mode == BLE_GAP_CONN_MODE_NON) {
*instance = BT_MESH_ADV_INST;
cur_conf = &ble_adv_cur_conf[BLE_ADV_PB_ADV_IDX];
cur_conf = &ble_adv_cur_conf[BT_MESH_ADV_IDX];
} else {
#if MYNEWT_VAL(BLE_MESH_PROXY)
*instance = BT_MESH_ADV_PROXY_INST;
cur_conf = &ble_adv_cur_conf[BLE_ADV_PB_GATT_IDX];
*instance = BT_MESH_ADV_GATT_INST;
cur_conf = &ble_adv_cur_conf[BT_MESH_GATT_IDX];
#else
assert(0);
#endif