🐛 Fix NimBLE ^2 compatibility

Author: leon0399

src/BLESerial.h

@@ -19,6 +19,15 @@
 #  include <BLEDevice.h>
 #endif // BLESERIAL_USE_NIMBLE
 
+#if !defined(BLESERIAL_NIMBLE_VERSION_MAJOR) && defined(BLESERIAL_USE_NIMBLE) && BLESERIAL_USE_NIMBLE
+#  if __has_include(<NimBLEAdvertisementData.h>)
+#    define BLESERIAL_NIMBLE_VERSION_MAJOR 2
+#  else // __has_include(<NimBLEAdvertisementData.h>)
+#    define BLESERIAL_NIMBLE_VERSION_MAJOR 1
+#  endif // __has_include(<NimBLEAdvertisementData.h>)
+#  warning "Using NimBLE version " BLESERIAL_NIMBLE_VERSION_MAJOR
+#endif // BLESERIAL_USE_NIMBLE
+
 #ifndef BLESERIAL_USE_STL
 #  define BLESERIAL_USE_STL true
 #endif // BLESERIAL_USE_STL
@@ -262,7 +271,15 @@ class BLESerialServerCallbacks : public BLEServerCallbacks {
   public:
     explicit BLESerialServerCallbacks(BLESerial<T>* bleSerial) : bleSerial(bleSerial) {}
 
+#if defined(BLESERIAL_USE_NIMBLE) && BLESERIAL_USE_NIMBLE
+#  if defined(NIMBLE_VERSION_MAJOR) && NIMBLE_VERSION_MAJOR >= 2
+    void onDisconnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo, int reason) override
+#  else // NIMBLE_VERSION_MAJOR >= 2
+    void onDisconnect(NimBLEServer* pServer, ble_gap_conn_desc* desc) override
+#  endif // NIMBLE_VERSION_MAJOR >= 2
+#else // BLESERIAL_USE_NIMBLE
     void onDisconnect(BLEServer* pServer) override
+#endif // BLESERIAL_USE_NIMBLE
     {
         auto* pAdvertising = pServer->getAdvertising();
         if (pAdvertising == nullptr) {
@@ -280,7 +297,15 @@ class BLESerialCharacteristicCallbacks : public BLECharacteristicCallbacks {
   public:
     explicit BLESerialCharacteristicCallbacks(BLESerial<T>* bleSerial) : bleSerial(bleSerial) {}
 
+#if defined(BLESERIAL_USE_NIMBLE) && BLESERIAL_USE_NIMBLE
+#  if defined(NIMBLE_VERSION_MAJOR) && NIMBLE_VERSION_MAJOR >= 2
+    void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override
+#  else // NIMBLE_VERSION_MAJOR >= 2
+    void onWrite(NimBLECharacteristic* pCharacteristic, ble_gap_conn_desc* desc) override
+#  endif // NIMBLE_VERSION_MAJOR >= 2
+#else // BLESERIAL_USE_NIMBLE
     void onWrite(BLECharacteristic* pCharacteristic) override
+#endif // BLESERIAL_USE_NIMBLE
     {
         if (pCharacteristic != bleSerial->m_pRxCharacteristic) {
             return;