Merge branch 'master' into CustomSettings

Author: lathoub

src/BLEMIDI_Transport.h

@@ -183,6 +183,7 @@ class BLEMIDI_Transport
 public:
     // callbacks
     void (*_connectedCallback)() = nullptr;
+    void (*_connectedCallbackDeviceName)(char *) = nullptr;
     void (*_disconnectedCallback)() = nullptr;
     void (*_connectedCallbackDeviceName)(char *) = nullptr;
 
@@ -198,6 +199,12 @@ class BLEMIDI_Transport
         _connectedCallback = fptr;
         return *this;
     }
+    
+    BLEMIDI_Transport &setHandleConnected(void (*fptr)(char*))
+    {
+        _connectedCallbackDeviceName= fptr;
+        return *this;
+    }
 
     BLEMIDI_Transport &setHandleConnected(void (*fptr)(char*))
     {

src/hardware/BLEMIDI_ArduinoBLE.h

@@ -2,11 +2,17 @@
 
 #include <ArduinoBLE.h>
 
+#define BLE_POLLING
+
 BEGIN_BLEMIDI_NAMESPACE
 
-template <typename T, short rawSize>
-class Fifo
-{
+BLEService midiService(SERVICE_UUID);
+
+BLEStringCharacteristic midiChar(CHARACTERISTIC_UUID,  // standard 16-bit characteristic UUID
+    BLERead | BLEWrite | BLENotify | BLEWriteWithoutResponse, 16); // remote clients will be able to get notifications if this characteristic changes
+
+template<typename T, int rawSize>
+class Fifo {
 public:
     const size_t size; // speculative feature, in case it's needed
 
@@ -226,7 +232,7 @@ bool BLEMIDI_ArduinoBLE<_Settings>::begin(const char *deviceName, BLEMIDI_Transp
 /*! \brief Create an instance for ArduinoBLE <DeviceName>
  */
 #define BLEMIDI_CREATE_INSTANCE(DeviceName, Name) \
-    BLEMIDI_CREATE_CUSTOM_INSTANCE(DeviceName, Name, BLEMIDI_NAMESPACE::DefaultSettings)
+    BLEMIDI_CREATE_CUSTOM_INSTANCE(DeviceName, Name, BLEMIDI_NAMESPACE::DefaultSettings);
 
 /*! \brief Create a default instance for ArduinoBLE named BLE-MIDI
  */

src/hardware/BLEMIDI_Client_ESP32.h

@@ -194,11 +194,10 @@ class BLEMIDI_Client_ESP32
     BLEAdvertising *_advertising = nullptr;
     BLERemoteCharacteristic *_characteristic = nullptr;
     BLERemoteService *pSvc = nullptr;
-    bool firstTimeSend = true; // First writeValue get sends like Write with reponse for clean security flags. After first time, all messages are send like WriteNoResponse for increase transmision speed.
-
+    bool firstTimeSend = true; //First writeValue get sends like Write with reponse for clean security flags. After first time, all messages are send like WriteNoResponse for increase transmision speed.
     char connectedDeviceName[24];
-
-    BLEMIDI_Transport<class BLEMIDI_Client_ESP32<_Settings>, _Settings> *_bleMidiTransport = nullptr;
+    
+    BLEMIDI_Transport<class BLEMIDI_Client_ESP32> *_bleMidiTransport = nullptr;
 
     bool specificTarget = false;
 
@@ -270,13 +269,12 @@ class BLEMIDI_Client_ESP32
         if (_bleMidiTransport->_connectedCallback)
             _bleMidiTransport->_connectedCallback();
         firstTimeSend = true;
-
+        
         if (_bleMidiTransport->_connectedCallbackDeviceName)
         {
             sprintf(connectedDeviceName, "%s", myAdvCB.advDevice.getName().c_str());
             _bleMidiTransport->_connectedCallbackDeviceName(connectedDeviceName);
         }
-
     }
 
     void disconnected()

src/hardware/BLEMIDI_ESP32.h

@@ -6,6 +6,9 @@
 #include <BLEServer.h>
 #include <BLE2902.h>
 
+// Note: error: redefinition of 'class BLEDescriptor' is a namespace collision on class BLEDescriptor between our ESp32 BLE and ArduinoBLE
+// Solution: remove ArduinoBLE
+
 BEGIN_BLEMIDI_NAMESPACE
 
 template <class _Settings>
@@ -116,7 +119,7 @@ class MyCharacteristicCallbacks : public BLECharacteristicCallbacks
 
     void onWrite(BLECharacteristic *characteristic)
     {
-        std::string rxValue = characteristic->getValue();
+        auto rxValue = characteristic->getValue();
         if (rxValue.length() > 0)
         {
             _bluetoothEsp32->receive((uint8_t *)(rxValue.c_str()), rxValue.length());

src/hardware/BLEMIDI_ESP32_NimBLE.h

@@ -166,9 +166,6 @@ bool BLEMIDI_ESP32_NimBLE<_Settings>::begin(const char *deviceName, BLEMIDI_Tran
 
     _characteristic->setCallbacks(new MyCharacteristicCallbacks<_Settings>(this));
 
-//    auto _security = new NimBLESecurity();
-//    _security->setAuthenticationMode(ESP_LE_AUTH_BOND);
-
     // Start the service
     service->start();