From a26dfe70aaf8b9da0dec6dd7a40079eb9514ac71 Mon Sep 17 00:00:00 2001 From: Hrishikesh Dhayagude Date: Thu, 24 Oct 2019 14:38:01 +0800 Subject: [PATCH] nimble: Miscellaneous changes 1. Update NimBLE submodule as per changes in adv interval and stop port 2. Make changes in ESP BLE Mesh NimBLE host code for the same --- .../mesh_core/nimble_host/mesh_bearer_adapt.c | 2 -- components/bt/host/nimble/nimble | 2 +- components/bt/host/nimble/port/include/esp_nimble_cfg.h | 8 ++++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c b/components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c index c4f1a1ff8..a19f957d5 100644 --- a/components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c +++ b/components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c @@ -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, diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index acaed3b6a..b2ae70c37 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit acaed3b6a860457b5cf61ecddce7d7be2c61a60a +Subproject commit b2ae70c37e544f93adc1f22c4954c93be7525bed diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h index 9cd59415f..fd3be39ee 100644 --- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h +++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h @@ -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)