alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'nimble/esp_ble_mesh_adv_fix' into 'master'

Browse Source 
nimble: Miscellaneous changes

See merge request espressif/esp-idf!6471
This commit is contained in:
Mahavir Jain 2019-10-24 14:38:02 +08:00
commit 8661f5f2e7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c
View File

@ -807,8 +807,6 @@ int bt_le_adv_start(const struct bt_mesh_adv_param *param,
} else {
adv_params.conn_mode = BLE_GAP_CONN_MODE_NON;
adv_params.disc_mode = BLE_GAP_DISC_MODE_NON;
adv_params.itvl_min = 160;
adv_params.itvl_max = 160;
}
err = ble_gap_adv_start(BLE_OWN_ADDR_PUBLIC, NULL, BLE_HS_FOREVER, &adv_params,

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit acaed3b6a860457b5cf61ecddce7d7be2c61a60a
Subproject commit b2ae70c37e544f93adc1f22c4954c93be7525bed

8
components/bt/host/nimble/port/include/esp_nimble_cfg.h
View File

@ -415,6 +415,14 @@
#define MYNEWT_VAL_BLE_HOST (1)
#endif
#ifndef MYNEWT_VAL_ESP_BLE_MESH
#ifdef CONFIG_BLE_MESH_HCI_5_0
#define MYNEWT_VAL_ESP_BLE_MESH (1)
#else
#define MYNEWT_VAL_ESP_BLE_MESH (0)
#endif
#endif
#ifndef MYNEWT_VAL_BLE_HS_DEBUG
#ifdef CONFIG_BT_NIMBLE_DEBUG
#define MYNEWT_VAL_BLE_HS_DEBUG (1)