components/bt: Add support of NimBLE host in ESP BLE Mesh

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/CMakeLists.txt

@@ -1,4 +1,5 @@
-set(COMPONENT_SRCS "ble_mesh_demo_main.c")
+set(COMPONENT_SRCS "ble_mesh_demo_main.c"
+                   "ble_mesh_demo_init.c")
 
 set(COMPONENT_ADD_INCLUDEDIRS ".")
 

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/ble_mesh_demo_init.c

@@ -0,0 +1,143 @@
+
+/*
+ * Copyright (c) 2017 Intel Corporation
+ * Additional Copyright (c) 2018 Espressif Systems (Shanghai) PTE LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <sdkconfig.h>
+/* BLE */
+#ifdef CONFIG_BT_BLUEDROID_ENABLED
+#include "esp_bt.h"
+#include "esp_bt_main.h"
+#include "esp_bt_device.h"
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_ENABLED
+#include "esp_nimble_hci.h"
+#include "nimble/nimble_port.h"
+#include "nimble/nimble_port_freertos.h"
+#include "host/ble_hs.h"
+#include "host/util/util.h"
+#include "console/console.h"
+#endif
+
+#include "esp_ble_mesh_defs.h"
+#include "ble_mesh_demo_init.h"
+#include "esp_ble_mesh_common_api.h"
+
+#ifdef CONFIG_BT_BLUEDROID_ENABLED
+
+void ble_mesh_get_dev_uuid(uint8_t *dev_uuid)
+{
+    memcpy(dev_uuid, esp_bt_dev_get_address(), BD_ADDR_LEN);
+}
+
+esp_err_t bluetooth_init(void)
+{
+    esp_err_t ret;
+
+
+    ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT));
+
+    esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+    ret = esp_bt_controller_init(&bt_cfg);
+    if (ret) {
+        ESP_LOGE(TAG, "%s initialize controller failed", __func__);
+        return ret;
+    }
+
+    ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
+    if (ret) {
+        ESP_LOGE(TAG, "%s enable controller failed", __func__);
+        return ret;
+    }
+    ret = esp_bluedroid_init();
+    if (ret) {
+        ESP_LOGE(TAG, "%s init bluetooth failed", __func__);
+        return ret;
+    }
+    ret = esp_bluedroid_enable();
+    if (ret) {
+        ESP_LOGE(TAG, "%s enable bluetooth failed", __func__);
+        return ret;
+    }
+
+    return ret;
+}
+
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_ENABLED
+static SemaphoreHandle_t mesh_sem;
+static uint8_t own_addr_type;
+void ble_store_config_init(void);
+static uint8_t addr_val[6] = {0};
+    
+void ble_mesh_get_dev_uuid(uint8_t *dev_uuid)
+{
+    memcpy(dev_uuid + 2, addr_val, BD_ADDR_LEN);
+}
+
+static void mesh_on_reset(int reason)
+{
+    ESP_LOGI(TAG, "Resetting state; reason=%d", reason);
+}
+
+static void mesh_on_sync(void)
+{
+    int rc;
+
+    rc = ble_hs_util_ensure_addr(0);
+    assert(rc == 0);
+
+    /* Figure out address to use while advertising (no privacy for now) */
+    rc = ble_hs_id_infer_auto(0, &own_addr_type);
+    if (rc != 0) {
+        ESP_LOGI(TAG, "error determining address type; rc=%d", rc);
+        return;
+    }
+
+    rc = ble_hs_id_copy_addr(own_addr_type, addr_val, NULL);
+
+    xSemaphoreGive(mesh_sem);
+}
+
+void mesh_host_task(void *param)
+{
+    ESP_LOGI(TAG, "BLE Host Task Started");
+    /* This function will return only when nimble_port_stop() is executed */
+    nimble_port_run();
+
+    nimble_port_freertos_deinit();
+}
+
+esp_err_t bluetooth_init(void)
+{
+    mesh_sem = xSemaphoreCreateBinary();
+    if (mesh_sem == NULL) {
+        ESP_LOGE(TAG, "Failed to create mesh semaphore");
+        return ESP_FAIL;
+    }
+
+    ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
+
+    nimble_port_init();
+    /* Initialize the NimBLE host configuration. */
+    ble_hs_cfg.reset_cb = mesh_on_reset;
+    ble_hs_cfg.sync_cb = mesh_on_sync;
+    ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
+
+    /* XXX Need to have template for store */
+    ble_store_config_init();
+
+    nimble_port_freertos_init(mesh_host_task);
+
+    xSemaphoreTake(mesh_sem, portMAX_DELAY);
+
+    return ESP_OK;
+}
+#endif

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/ble_mesh_demo_init.h

@@ -0,0 +1,18 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#ifndef _BLE_MESH_DEMO_INIT_H_
+#define _BLE_MESH_DEMO_INIT_H_
+
+#define TAG "FAST_PROV_CLIENT_DEMO"
+
+void ble_mesh_get_dev_uuid(uint8_t *dev_uuid);
+
+esp_err_t bluetooth_init(void);
+
+#endif

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/ble_mesh_demo_main.c

@@ -19,10 +19,6 @@
 #include "esp_log.h"
 #include "nvs_flash.h"
 
-#include "esp_bt.h"
-#include "esp_bt_main.h"
-#include "esp_bt_device.h"
-#include "esp_gap_ble_api.h"
 #include "esp_ble_mesh_defs.h"
 #include "esp_ble_mesh_common_api.h"
 #include "esp_ble_mesh_provisioning_api.h"
@@ -33,8 +29,7 @@
 #include "esp_fast_prov_common.h"
 #include "esp_fast_prov_operation.h"
 #include "esp_fast_prov_client_model.h"
-
-#define TAG "FAST_PROV_CLIENT_DEMO"
+#include "ble_mesh_demo_init.h"
 
 #define PROV_OWN_ADDR       0x0001
 #define APP_KEY_OCTET       0x12
@@ -191,8 +186,8 @@ static void provisioner_prov_complete(int node_index, const uint8_t uuid[16], ui
     }
 }
 
-static void example_recv_unprov_adv_pkt(uint8_t dev_uuid[16], uint8_t addr[ESP_BD_ADDR_LEN],
-                                        esp_ble_addr_type_t addr_type, uint16_t oob_info,
+static void example_recv_unprov_adv_pkt(uint8_t dev_uuid[16], uint8_t addr[BLE_MESH_ADDR_LEN],
+                                        esp_ble_mesh_addr_type_t addr_type, uint16_t oob_info,
                                         uint8_t adv_type, esp_ble_mesh_prov_bearer_t bearer)
 {
     esp_ble_mesh_unprov_dev_add_t add_dev = {0};
@@ -532,8 +527,6 @@ static esp_err_t ble_mesh_init(void)
 {
     esp_err_t err;
 
-    memcpy(dev_uuid, esp_bt_dev_get_address(), 6);
-
     prov_info.unicast_min = prov.prov_start_address + prov_info.max_node_num;
     prov_info.match_len   = sizeof(match);
     memcpy(prov_info.match_val, match, sizeof(match));
@@ -544,18 +537,18 @@ static esp_err_t ble_mesh_init(void)
     esp_ble_mesh_register_config_client_callback(example_config_client_callback);
     esp_ble_mesh_register_generic_client_callback(example_generic_client_callback);
 
-    err = esp_ble_mesh_provisioner_set_dev_uuid_match(match, 0x02, 0x00, false);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: Failed to set matching device UUID", __func__);
-        return ESP_FAIL;
-    }
-
     err = esp_ble_mesh_init(&prov, &comp);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "%s: Failed to initialize BLE Mesh", __func__);
         return ESP_FAIL;
     }
 
+    err = esp_ble_mesh_provisioner_set_dev_uuid_match(match, 0x02, 0x00, false);
+    if (err != ESP_OK) {
+        ESP_LOGE(TAG, "%s: Failed to set matching device UUID", __func__);
+        return ESP_FAIL;
+    }
+
     err = esp_ble_mesh_client_model_init(&vnd_models[0]);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "%s: Failed to initialize fast prov client model", __func__);
@@ -579,57 +572,27 @@ static esp_err_t ble_mesh_init(void)
     return err;
 }
 
-esp_err_t bluetooth_init(void)
-{
-    esp_err_t ret;
-
-    ret = nvs_flash_init();
-    if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
-        ESP_ERROR_CHECK(nvs_flash_erase());
-        ret = nvs_flash_init();
-    }
-    ESP_ERROR_CHECK(ret);
-
-    ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT));
-
-    esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
-    ret = esp_bt_controller_init(&bt_cfg);
-    if (ret) {
-        ESP_LOGE(TAG, "%s initialize controller failed", __func__);
-        return ret;
-    }
-
-    ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
-    if (ret) {
-        ESP_LOGE(TAG, "%s enable controller failed", __func__);
-        return ret;
-    }
-    ret = esp_bluedroid_init();
-    if (ret) {
-        ESP_LOGE(TAG, "%s init bluetooth failed", __func__);
-        return ret;
-    }
-    ret = esp_bluedroid_enable();
-    if (ret) {
-        ESP_LOGE(TAG, "%s enable bluetooth failed", __func__);
-        return ret;
-    }
-
-    return ret;
-}
-
 void app_main(void)
 {
     int err;
 
     ESP_LOGI(TAG, "Initializing...");
 
+    err = nvs_flash_init();
+    if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
+        ESP_ERROR_CHECK(nvs_flash_erase());
+        err = nvs_flash_init();
+    }
+    ESP_ERROR_CHECK(err);
+
     err = bluetooth_init();
     if (err) {
         ESP_LOGE(TAG, "esp32_bluetooth_init failed (err %d)", err);
         return;
     }
 
+    ble_mesh_get_dev_uuid(dev_uuid);
+
     /* Initialize the Bluetooth Mesh Subsystem */
     err = ble_mesh_init();
     if (err) {

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/CMakeLists.txt

@@ -1,4 +1,5 @@
 set(COMPONENT_SRCS "ble_mesh_demo_main.c"
+                   "ble_mesh_demo_init.c"
                    "board.c")
 
 set(COMPONENT_ADD_INCLUDEDIRS ".")

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/ble_mesh_demo_init.c

@@ -0,0 +1,143 @@
+
+/*
+ * Copyright (c) 2017 Intel Corporation
+ * Additional Copyright (c) 2018 Espressif Systems (Shanghai) PTE LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <sdkconfig.h>
+/* BLE */
+#ifdef CONFIG_BT_BLUEDROID_ENABLED
+#include "esp_bt.h"
+#include "esp_bt_main.h"
+#include "esp_bt_device.h"
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_ENABLED
+#include "esp_nimble_hci.h"
+#include "nimble/nimble_port.h"
+#include "nimble/nimble_port_freertos.h"
+#include "host/ble_hs.h"
+#include "host/util/util.h"
+#include "console/console.h"
+#endif
+
+#include "esp_ble_mesh_defs.h"
+#include "ble_mesh_demo_init.h"
+#include "esp_ble_mesh_common_api.h"
+
+#ifdef CONFIG_BT_BLUEDROID_ENABLED
+
+void ble_mesh_get_dev_uuid(uint8_t *dev_uuid)
+{
+    memcpy(dev_uuid + 2, esp_bt_dev_get_address(), BD_ADDR_LEN);
+}
+
+esp_err_t bluetooth_init(void)
+{
+    esp_err_t ret;
+
+
+    ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT));
+
+    esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+    ret = esp_bt_controller_init(&bt_cfg);
+    if (ret) {
+        ESP_LOGE(TAG, "%s initialize controller failed", __func__);
+        return ret;
+    }
+
+    ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
+    if (ret) {
+        ESP_LOGE(TAG, "%s enable controller failed", __func__);
+        return ret;
+    }
+    ret = esp_bluedroid_init();
+    if (ret) {
+        ESP_LOGE(TAG, "%s init bluetooth failed", __func__);
+        return ret;
+    }
+    ret = esp_bluedroid_enable();
+    if (ret) {
+        ESP_LOGE(TAG, "%s enable bluetooth failed", __func__);
+        return ret;
+    }
+
+    return ret;
+}
+
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_ENABLED
+static SemaphoreHandle_t mesh_sem;
+static uint8_t own_addr_type;
+void ble_store_config_init(void);
+static uint8_t addr_val[6] = {0};
+    
+void ble_mesh_get_dev_uuid(uint8_t *dev_uuid)
+{
+    memcpy(dev_uuid + 2, addr_val, BD_ADDR_LEN);
+}
+
+static void mesh_on_reset(int reason)
+{
+    ESP_LOGI(TAG, "Resetting state; reason=%d", reason);
+}
+
+static void mesh_on_sync(void)
+{
+    int rc;
+
+    rc = ble_hs_util_ensure_addr(0);
+    assert(rc == 0);
+
+    /* Figure out address to use while advertising (no privacy for now) */
+    rc = ble_hs_id_infer_auto(0, &own_addr_type);
+    if (rc != 0) {
+        ESP_LOGI(TAG, "error determining address type; rc=%d", rc);
+        return;
+    }
+
+    rc = ble_hs_id_copy_addr(own_addr_type, addr_val, NULL);
+
+    xSemaphoreGive(mesh_sem);
+}
+
+void mesh_host_task(void *param)
+{
+    ESP_LOGI(TAG, "BLE Host Task Started");
+    /* This function will return only when nimble_port_stop() is executed */
+    nimble_port_run();
+
+    nimble_port_freertos_deinit();
+}
+
+esp_err_t bluetooth_init(void)
+{
+    mesh_sem = xSemaphoreCreateBinary();
+    if (mesh_sem == NULL) {
+        ESP_LOGE(TAG, "Failed to create mesh semaphore");
+        return ESP_FAIL;
+    }
+
+    ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
+
+    nimble_port_init();
+    /* Initialize the NimBLE host configuration. */
+    ble_hs_cfg.reset_cb = mesh_on_reset;
+    ble_hs_cfg.sync_cb = mesh_on_sync;
+    ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
+
+    /* XXX Need to have template for store */
+    ble_store_config_init();
+
+    nimble_port_freertos_init(mesh_host_task);
+
+    xSemaphoreTake(mesh_sem, portMAX_DELAY);
+
+    return ESP_OK;
+}
+#endif

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/ble_mesh_demo_init.h

@@ -0,0 +1,18 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#ifndef _BLE_MESH_DEMO_INIT_H_
+#define _BLE_MESH_DEMO_INIT_H_
+
+#define TAG "FAST_PROV_SERVER_DEMO"
+
+void ble_mesh_get_dev_uuid(uint8_t *dev_uuid);
+
+esp_err_t bluetooth_init(void);
+
+#endif

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/ble_mesh_demo_main.c

@@ -18,10 +18,6 @@
 #include "esp_log.h"
 #include "nvs_flash.h"
 
-#include "esp_bt.h"
-#include "esp_bt_main.h"
-#include "esp_bt_device.h"
-
 #include "esp_ble_mesh_defs.h"
 #include "esp_ble_mesh_common_api.h"
 #include "esp_ble_mesh_networking_api.h"
@@ -33,8 +29,7 @@
 #include "esp_fast_prov_operation.h"
 #include "esp_fast_prov_client_model.h"
 #include "esp_fast_prov_server_model.h"
-
-#define TAG "FAST_PROV_SERVER_DEMO"
+#include "ble_mesh_demo_init.h"
 
 extern struct _led_state led_state[3];
 extern struct k_delayed_work send_self_prov_node_addr_timer;
@@ -336,8 +331,8 @@ static void provisioner_prov_complete(int node_idx, const uint8_t uuid[16], uint
     }
 }
 
-static void example_recv_unprov_adv_pkt(uint8_t dev_uuid[16], uint8_t addr[ESP_BD_ADDR_LEN],
-                                        esp_ble_addr_type_t addr_type, uint16_t oob_info,
+static void example_recv_unprov_adv_pkt(uint8_t dev_uuid[16], uint8_t addr[BLE_MESH_ADDR_LEN],
+                                        esp_ble_mesh_addr_type_t addr_type, uint16_t oob_info,
                                         uint8_t adv_type, esp_ble_mesh_prov_bearer_t bearer)
 {
     esp_ble_mesh_unprov_dev_add_t add_dev = {0};
@@ -358,7 +353,7 @@ static void example_recv_unprov_adv_pkt(uint8_t dev_uuid[16], uint8_t addr[ESP_B
         add_dev.oob_info = oob_info;
         add_dev.bearer = (uint8_t)bearer;
         memcpy(add_dev.uuid, dev_uuid, 16);
-        memcpy(add_dev.addr, addr, ESP_BD_ADDR_LEN);
+        memcpy(add_dev.addr, addr, BLE_MESH_ADDR_LEN);
         flag = ADD_DEV_RM_AFTER_PROV_FLAG | ADD_DEV_START_PROV_NOW_FLAG | ADD_DEV_FLUSHABLE_DEV_FLAG;
         err = esp_ble_mesh_provisioner_add_unprov_dev(&add_dev, flag);
         if (err != ESP_OK) {
@@ -733,9 +728,6 @@ static esp_err_t ble_mesh_init(void)
 {
     esp_err_t err;
 
-    /* First two bytes of device uuid is compared with match value by Provisioner */
-    memcpy(dev_uuid + 2, esp_bt_dev_get_address(), 6);
-
     esp_ble_mesh_register_prov_callback(example_ble_mesh_provisioning_cb);
     esp_ble_mesh_register_custom_model_callback(example_ble_mesh_custom_model_cb);
     esp_ble_mesh_register_config_client_callback(example_ble_mesh_config_client_cb);
@@ -774,47 +766,6 @@ static esp_err_t ble_mesh_init(void)
     return ESP_OK;
 }
 
-static esp_err_t bluetooth_init(void)
-{
-    esp_err_t ret;
-
-    ret = nvs_flash_init();
-    if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
-        ESP_ERROR_CHECK(nvs_flash_erase());
-        ret = nvs_flash_init();
-    }
-    ESP_ERROR_CHECK(ret);
-
-    ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT));
-
-    esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
-    ret = esp_bt_controller_init(&bt_cfg);
-    if (ret) {
-        ESP_LOGE(TAG, "%s initialize controller failed", __func__);
-        return ret;
-    }
-
-    ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
-    if (ret) {
-        ESP_LOGE(TAG, "%s enable controller failed", __func__);
-        return ret;
-    }
-
-    ret = esp_bluedroid_init();
-    if (ret) {
-        ESP_LOGE(TAG, "%s init bluetooth failed", __func__);
-        return ret;
-    }
-
-    ret = esp_bluedroid_enable();
-    if (ret) {
-        ESP_LOGE(TAG, "%s enable bluetooth failed", __func__);
-        return ret;
-    }
-
-    return ret;
-}
-
 void app_main(void)
 {
     esp_err_t err;
@@ -827,12 +778,21 @@ void app_main(void)
         return;
     }
 
+    err = nvs_flash_init();
+    if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
+        ESP_ERROR_CHECK(nvs_flash_erase());
+        err = nvs_flash_init();
+    }
+    ESP_ERROR_CHECK(err);
+
     err = bluetooth_init();
     if (err) {
         ESP_LOGE(TAG, "esp32_bluetooth_init failed (err %d)", err);
         return;
     }
 
+    ble_mesh_get_dev_uuid(dev_uuid);
+
     /* Initialize the Bluetooth Mesh Subsystem */
     err = ble_mesh_init();
     if (err) {