Merge pull request #501 from orrmany/develop-multiprotocol-ble

Make Bluferuit52 multiprotocol friendly

Author: hathach

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -162,6 +162,9 @@ AdafruitBluefruit::AdafruitBluefruit(void)
 
   _ble_event_sem = NULL;
   _soc_event_sem = NULL;
+#ifdef ANT_LICENSE_KEY
+  _mprot_event_sem = NULL; //additiona semaphore for multiprotocol 
+#endif
 
   _led_blink_th  = NULL;
   _led_conn      = true;
@@ -310,7 +313,15 @@ bool AdafruitBluefruit::begin(uint8_t prph_count, uint8_t central_count)
   #error Clock Source is not configured, define USE_LFXO or USE_LFRC according to your board in variant.h
 #endif
 
+  /*------------------------------------------------------------------
+  ** BLE only Softdevices have 2-args sd_softdevice_enable()
+  ** BLE & ANT+ Softdevices have 3-args sd_softdevice_enable()
+  */
+  #ifdef ANT_LICENSE_KEY
+  VERIFY_STATUS( sd_softdevice_enable(&clock_cfg, nrf_error_cb, ANT_LICENSE_KEY), false );
+#else //#ifdef ANT_LICENSE_KEY
   VERIFY_STATUS( sd_softdevice_enable(&clock_cfg, nrf_error_cb), false );
+#endif //#ifdef ANT_LICENSE_KEY
 
 #ifdef USE_TINYUSB
   usb_softdevice_post_enable();
@@ -676,6 +687,10 @@ void SD_EVT_IRQHandler(void)
   // Notify both BLE & SOC Task
   xSemaphoreGiveFromISR(Bluefruit._soc_event_sem, NULL);
   xSemaphoreGiveFromISR(Bluefruit._ble_event_sem, NULL);
+#ifdef ANT_LICENSE_KEY
+  // Notify parallel multiprotocol Task, if any
+  if (Bluefruit._mprot_event_sem)  xSemaphoreGiveFromISR(Bluefruit._mprot_event_sem, NULL);
+#endif
 }
 
 /**

libraries/Bluefruit52Lib/src/bluefruit.h

@@ -178,6 +178,17 @@ class AdafruitBluefruit
 
     BLEConnection* Connection(uint16_t conn_hdl);
 
+#ifdef ANT_LICENSE_KEY
+    /*------------------------------------------------------------------*
+     * Optional semaphore for additional event handlers for SD event.
+     * It can be used for handling non-BLE  SD events 
+     *------------------------------------------------------------------*/
+    void setMultiprotocolSemaphore(SemaphoreHandle_t* p_mprot_event_semaphore) 
+    { 
+        _mprot_event_sem= p_mprot_event_semaphore;
+    } 
+#endif
+
     /*------------------------------------------------------------------*/
     /* Callbacks
      *------------------------------------------------------------------*/
@@ -222,6 +233,12 @@ class AdafruitBluefruit
 
     SemaphoreHandle_t _ble_event_sem;
     SemaphoreHandle_t _soc_event_sem;
+#ifdef ANT_LICENSE_KEY
+    /* Optional semaphore for additional event handlers for SD event.
+     * It can be used for handling non-BLE  SD events 
+     */
+    SemaphoreHandle_t* _mprot_event_sem;
+#endif
 
     TimerHandle_t _led_blink_th;
     bool _led_conn;