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

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 c4f1a1ff87bd88f91ea9920cc999b35334703481..a19f957d53bc0dbdcd5e65192826e9e341d6e0d0 100644 (file)
--- 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 acaed3b6a860457b5cf61ecddce7d7be2c61a60a..b2ae70c37e544f93adc1f22c4954c93be7525bed 160000 (submodule)
--- 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 9cd59415f68837c8f5eca8306a0ad2348cc081ad..fd3be39ee8676f7286051d0f822c02f331e537e1 100644 (file)
--- 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)