Release 1.3.1

This reverts a previous change @2e1d78ff that caused compiling/linking errors due to the redefinition of btInUse() when another linked library uses the Arduino bluetooth code.

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.  
 
+## [1.3.1] - 2021-08-04
+
+### Fixed
+- Corrected a compiler/linker error when an application or a library uses bluetooth classic due to the redefinition of `btInUse`.
+
 ## [1.3.0] - 2021-08-02
 
 ### Added

docs/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "esp-nimble-cpp / NimBLE-Arduino"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.2.0
+PROJECT_NUMBER         = 1.3.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

src/NimBLEDevice.cpp

@@ -31,8 +31,7 @@
 #include "services/gatt/ble_svc_gatt.h"
 
 #ifdef CONFIG_ENABLE_ARDUINO_DEPENDS
-extern "C" bool btInUse();
-bool btInUse(){ return true; }
+#include "esp32-hal-bt.h"
 #endif
 
 #include "NimBLELog.h"
@@ -740,6 +739,12 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
     if(!initialized){
         int rc=0;
         esp_err_t errRc = ESP_OK;
+
+#ifdef CONFIG_ENABLE_ARDUINO_DEPENDS
+        // make sure the linker includes esp32-hal-bt.c so ardruino init doesn't release BLE memory.
+        btStarted();
+#endif
+
         errRc = nvs_flash_init();
 
         if (errRc == ESP_ERR_NVS_NO_FREE_PAGES || errRc == ESP_ERR_NVS_NEW_VERSION_FOUND) {