BLE support for arduino-esp32 3.3.0

tttapa · tttapa · commit b3fa8bfa99ec · 2025-08-10T18:55:12.000+02:00
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/advertise.ipp b/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/advertise.ipp
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_NIMBLE_ENABLED
 
 #include "ble.h"
 
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/app.ipp b/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/app.ipp
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_NIMBLE_ENABLED
 
 #include "ble.h"
 
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/events.ipp b/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/events.ipp
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_NIMBLE_ENABLED
 
 #include "advertise.hpp"
 #include "callbacks.h"
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/gatt.c.ipp b/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/gatt.c.ipp
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_NIMBLE_ENABLED
 
 #include "ble.h"
 
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/init.ipp b/src/MIDI_Interfaces/BLEMIDI/ESP32-NimBLE/init.ipp
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_NIMBLE_ENABLED
 
 #include "ble.h"
 
@@ -43,7 +43,9 @@ inline bool init_hardware() {
     ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT));
     ESP_ERROR_CHECK(esp_bt_controller_init(&bt_cfg));
     ESP_ERROR_CHECK(esp_bt_controller_enable(ESP_BT_MODE_BLE));
+    #if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 3, 0)
     ESP_ERROR_CHECK(esp_nimble_hci_init());
+    #endif
 #endif
 
 #if CS_MIDI_BLE_ESP_IDF_NIMBLE
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/advertising.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/advertising.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 #include "advertising.h"
 #include "logging.h"
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/app.cpp b/src/MIDI_Interfaces/BLEMIDI/ESP32/app.cpp
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 #include "advertising.h"
 #include "app.h"
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/ble2902.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/ble2902.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 #include "app.h"
 #include "ble2902.h"
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/esp_enums2string.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/esp_enums2string.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 #include "esp_enums2string.h"
 
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/events-debug.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/events-debug.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 #include "events-debug.h"
 #include "esp_enums2string.h"
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/events.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/events.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 #include "advertising.h"
 #include "esp_enums2string.h"
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-app.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-app.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /** 
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-connection.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-connection.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /**
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-events.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-events.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /**
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-init.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-init.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /**
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-mtu.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-mtu.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /**
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-notify.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-notify.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /** 
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-read.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-read.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /** 
  * @file
diff --git a/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-write.c b/src/MIDI_Interfaces/BLEMIDI/ESP32/midi-write.c
@@ -1,6 +1,6 @@
 #ifdef ESP32
 #include <sdkconfig.h>
-#if CONFIG_BT_BLE_ENABLED
+#if CONFIG_BT_BLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED
 
 /**
  * @file 
diff --git a/src/MIDI_Interfaces/BluetoothMIDI_Interface.hpp b/src/MIDI_Interfaces/BluetoothMIDI_Interface.hpp
@@ -20,22 +20,40 @@ END_BEGIN_CS_NAMESPACE
 
 #elif defined(ESP32)
 #include <sdkconfig.h>
+// ESP32 with BLE support (arduino-esp32 < 3.3.0)
 #if CONFIG_BT_BLE_ENABLED
-// ESP32 with BLE support
 #ifdef CS_USE_NIMBLE
+#define CS_BLE_MIDI_BACKEND_NIMBLE 1
+#else
+#define CS_BLE_MIDI_BACKEND_NIMBLE 0
+#endif
+#define CS_BLE_MIDI_SUPPORTED 1
+// ESP32 with native Nimble support (arduino-esp32 >= 3.3.0)
+#elif CONFIG_BT_NIMBLE_ENABLED
+#define CS_BLE_MIDI_BACKEND_NIMBLE 1
+#define CS_BLE_MIDI_SUPPORTED 1
+// ESP32 with native Bluedroid support (arduino-esp32 >= 3.3.0) -- Untested
+#elif CONFIG_BT_BLUEDROID_ENABLED
+#ifdef CS_USE_NIMBLE
+#pragma warning ("CS_USE_NIMBLE ignored (CONFIG_BT_NIMBLE_ENABLED != 1)")
+#endif
+#define CS_BLE_MIDI_BACKEND_NIMBLE 0
+#define CS_BLE_MIDI_SUPPORTED 1
+#endif
+
+#if CS_BLE_MIDI_SUPPORTED
 // NimBLE backend
+#if CS_BLE_MIDI_BACKEND_NIMBLE
 #include "BLEMIDI/ESP32NimBLEBackend.hpp"
 BEGIN_CS_NAMESPACE
 using BLEMIDIBackend = ESP32NimBLEBackend;
 END_CS_NAMESPACE
-#define CS_BLE_MIDI_SUPPORTED 1
 #else
 // Bluedroid backend (default)
 #include "BLEMIDI/ESP32BluedroidBackend.hpp"
 BEGIN_CS_NAMESPACE
 using BLEMIDIBackend = ESP32BluedroidBackend;
 END_CS_NAMESPACE
-#define CS_BLE_MIDI_SUPPORTED 1
 #endif
 #endif
 
