Update v1.4.x nimble core to esp-nimble 1.5.0

Author: h2zero

src/NimBLEDevice.cpp

@@ -866,19 +866,23 @@ void NimBLEDevice::init(const std::string &deviceName) {
 
         esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
 
+# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
         esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
-#if  defined (CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
+#  if  defined (CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
         bt_cfg.bluetooth_mode = ESP_BT_MODE_BLE;
-#else
+#  else
         bt_cfg.mode = ESP_BT_MODE_BLE;
         bt_cfg.ble_max_conn = CONFIG_BT_NIMBLE_MAX_CONNECTIONS;
-#endif
+#  endif
+
+#  ifdef CONFIG_BTDM_BLE_SCAN_DUPL
         bt_cfg.normal_adv_size = m_scanDuplicateSize;
         bt_cfg.scan_duplicate_type = m_scanFilterMode;
-
+#  endif
         ESP_ERROR_CHECK(esp_bt_controller_init(&bt_cfg));
         ESP_ERROR_CHECK(esp_bt_controller_enable(ESP_BT_MODE_BLE));
         ESP_ERROR_CHECK(esp_nimble_hci_init());
+# endif
 #endif
         nimble_port_init();
 
@@ -925,10 +929,12 @@ void NimBLEDevice::deinit(bool clearAll) {
     if (ret == 0) {
         nimble_port_deinit();
 #ifdef ESP_PLATFORM
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
         ret = esp_nimble_hci_and_controller_deinit();
         if (ret != ESP_OK) {
             NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
         }
+#endif
 #endif
         initialized = false;
         m_synced = false;

src/nimble/NOTICE

@@ -1,6 +1,6 @@
 Apache Mynewt NimBLE
-Copyright 2015-2020 The Apache Software Foundation
-Modifications Copyright 2017-2020 Espressif Systems (Shanghai) CO., LTD.
+Copyright 2015-2022 The Apache Software Foundation
+Modifications Copyright 2017-2022 Espressif Systems (Shanghai) CO., LTD.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

src/nimble/README.md

@@ -19,22 +19,24 @@
 #
 -->
 
+  
 <img src="http://mynewt.apache.org/img/logo.svg" width="250" alt="Apache Mynewt">
 
+
 ## Overview
 
 Apache NimBLE is an open-source Bluetooth 5.1 stack (both Host & Controller)
 that completely replaces the proprietary SoftDevice on Nordic chipsets. It is
 part of [Apache Mynewt project](https://github.com/apache/mynewt-core).
 
-Features highlight:
-  - Support for 251 byte packet size
+Feature highlight:
+  - Support for 251 byte packet size.
   - Support for all 4 roles concurrently - Broadcaster, Observer, Peripheral and Central
   - Support for up to 32 simultaneous connections.
   - Legacy and SC (secure connections) SMP support (pairing and bonding).
   - Advertising Extensions.
   - Periodic Advertising.
-  - Coded (aka Long Range) and 2M PHYs.
+  - Coded (a.k.a. Long Range) and 2M PHYs.
   - Bluetooth Mesh.
 
 ## Supported hardware

src/nimble/RELEASE_NOTES.md

@@ -1,21 +1,24 @@
 # RELEASE NOTES
 
-24 March 2021 - Apache NimBLE v1.4.0
+20 April 2022 - Apache NimBLE v1.5.0
 
 For full release notes, please visit the
 [Apache Mynewt Wiki](https://cwiki.apache.org/confluence/display/MYNEWT/Release+Notes).
 
-Apache NimBLE is an open-source Bluetooth 5.1 stack (both Host & Controller) that completely
+Apache NimBLE is an open-source Bluetooth 5.3 stack (both Host & Controller) that completely
 replaces the proprietary SoftDevice on Nordic chipsets.
 
 New features in this version of NimBLE include:
 
-* Support for PHY on Dialog Configurable MAC (CMAC)
-* Support for PHY on Nordic nRF5340
-* Support for Apache NuttX port of NimBLE
-* Controller-to-host flow control support
-* Support for USB transport
-* Various bugfixes
+* Fake dual-mode option for controller
+* LLCP tracing via HCI events
+* Code size optimization for disabled GAP roles
+* Support for PA/LNA
+* LE Secure Connections Only mode
+* Support for Bluetooth Core Specification 5.3
+* Connection subrating
+* BabbleSim support
+* Various bugfixes and improvements
 
 If working on next-generation RTOS and Bluetooth protocol stack
 sounds exciting to you, get in touch, by sending a mail to the Apache Mynewt

src/nimble/esp_port/esp-hci/include/esp_nimble_hci.h

@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifdef ESP_PLATFORM
 #ifndef __ESP_NIMBLE_HCI_H__
 #define __ESP_NIMBLE_HCI_H__
 
-#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "nimble/nimble/transport/include/nimble/transport.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,46 +33,6 @@ extern "C" {
  */
 esp_err_t esp_nimble_hci_init(void);
 
-/**
- * @brief Initialize ESP Bluetooth controller(link layer) and VHCI transport
- * layer between NimBLE Host and ESP Bluetooth controller
- *
- * This function initializes ESP controller in BLE only mode and the
- * transport buffers to be exchanged between NimBLE host and ESP controller.
- * It also registers required host callbacks with the controller.
- *
- * Below is the sequence of APIs to be called to init/enable NimBLE host and ESP controller:
- *
- * @code{c}
- * void ble_host_task(void *param)
- * {
- *      nimble_port_run(); //This function will return only when nimble_port_stop() is executed.
- *      nimble_port_freertos_deinit();
- * }
- *
- * int ret = esp_nimble_hci_and_controller_init();
- * if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "esp_nimble_hci_and_controller_init() failed with error: %d", ret);
- *      return;
- * }
- *
- * nimble_port_init();
- *
- * //Initialize the NimBLE Host configuration
- *
- * nimble_port_freertos_init(ble_host_task);
- * @endcode
- *
- * nimble_port_freertos_init() is an optional call that creates a new task in which the NimBLE
- * host will run. The task function should have a call to nimble_port_run(). If a separate task
- * is not required, calling nimble_port_run() will run the NimBLE host in the current task.
- *
- * @return
- *    - ESP_OK if the initialization is successful
- *    - Appropriate error code from esp_err_t in case of an error
- */
-esp_err_t esp_nimble_hci_and_controller_init(void);
-
 /**
  * @brief Deinitialize VHCI transport layer between NimBLE Host and
  * ESP Bluetooth controller
@@ -86,40 +45,8 @@ esp_err_t esp_nimble_hci_and_controller_init(void);
  */
 esp_err_t esp_nimble_hci_deinit(void);
 
-/**
- * @brief Deinitialize VHCI transport layer between NimBLE Host and
- * ESP Bluetooth controller and disable and deinitialize the controller
- *
- * @note This function should not be executed in the context of Bluetooth host task.
- *
- * @note This function should be called after the NimBLE host is deinitialized.
- *
- * Below is the sequence of APIs to be called to disable/deinit NimBLE host and ESP controller:
- *
- * @code{c}
- * int ret = nimble_port_stop();
- * if (ret == 0) {
- *      nimble_port_deinit();
- *
- *      ret = esp_nimble_hci_and_controller_deinit();
- *      if (ret != ESP_OK) {
-            ESP_LOGE(TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
- *      }
- * }
- * @endcode
- *
- * If nimble_port_freertos_init() is used during initialization, then
- * nimble_port_freertos_deinit() should be called in the host task after nimble_port_run().
- *
- * @return
- *    - ESP_OK if the deinitialization is successful
- *    - Appropriate error codes from esp_err_t in case of an error
- */
-esp_err_t esp_nimble_hci_and_controller_deinit(void);
-
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* __ESP_NIMBLE_HCI_H__ */
-#endif