Add conditional checks to ensure the stack is setup correctly.

Author: h2zero

src/NimBLEDevice.cpp

@@ -865,9 +865,11 @@ void NimBLEDevice::init(const std::string &deviceName) {
 
         ESP_ERROR_CHECK(errRc);
 
+#ifdef CONFIG_IDF_TARGET_ESP32
         esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
+#endif
 
-# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
+# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) || !defined(CONFIG_NIMBLE_CPP_IDF)
         esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
 #  if  defined (CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
         bt_cfg.bluetooth_mode = ESP_BT_MODE_BLE;
@@ -929,7 +931,7 @@ void NimBLEDevice::deinit(bool clearAll) {
     int ret = nimble_port_stop();
     if (ret == 0) {
         nimble_port_deinit();
-#if defined(CONFIG_NIMBLE_CPP_IDF)
+#ifdef CONFIG_NIMBLE_CPP_IDF
 # if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
         ret = esp_nimble_hci_and_controller_deinit();
         if (ret != ESP_OK) {

src/nimconfig.h

@@ -293,6 +293,14 @@
 #define CONFIG_IDF_TARGET_ESP32 1
 #endif
 
+#if !defined(CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE)
+#define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE 1
+#endif
+
+#if !defined(CONFIG_BT_CONTROLLER_DISABLED)
+#define CONFIG_BT_CONTROLLER_DISABLED 0
+#endif
+
 #if CONFIG_BT_NIMBLE_EXT_ADV || CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV
 #  if defined(CONFIG_IDF_TARGET_ESP32)
 #    error Extended advertising is not supported on ESP32.