Diff: main.cpp

Revision:

7:88f50499af9a

Parent:

5:103717ce54e5

--- a/main.cpp	Tue Sep 29 12:03:32 2015 +0000
+++ b/main.cpp	Tue Jan 12 11:00:02 2016 +0000
@@ -15,10 +15,10 @@
  */
 
 #include "mbed.h"
-#include "BLE.h"
+#include "ble/BLE.h"
 
-BLE        ble;
-DigitalOut led1(LED1);
+DigitalOut led1(LED1, 1);
+Ticker     ticker;
 
 void periodicCallback(void)
 {
@@ -38,16 +38,43 @@
 #endif /* DUMP_ADV_DATA */
 }
 
+/**
+ * This function is called when the ble initialization process has failed
+ */
+void onBleInitError(BLE &ble, ble_error_t error)
+{
+    /* Initialization error handling should go here */
+}
+
+/**
+ * Callback triggered when the ble initialization process has finished
+ */
+void bleInitComplete(BLE::InitializationCompleteCallbackContext *params)
+{
+    BLE&        ble   = params->ble;
+    ble_error_t error = params->error;
+
+    if (error != BLE_ERROR_NONE) {
+        /* In case of error, forward the error handling to onBleInitError */
+        onBleInitError(ble, error);
+        return;
+    }
+
+    /* Ensure that it is the default instance of BLE */
+    if(ble.getInstanceID() != BLE::DEFAULT_INSTANCE) {
+        return;
+    }
+ 
+    ble.gap().setScanParams(500 /* scan interval */, 200 /* scan window */);
+    ble.gap().startScan(advertisementCallback);
+}
+
 int main(void)
 {
-    led1 = 1;
-    Ticker ticker;
     ticker.attach(periodicCallback, 1);
 
-    ble.init();
-
-    ble.gap().setScanParams(500 /* scan interval */, 200 /* scan window */);
-    ble.gap().startScan(advertisementCallback);
+    BLE &ble = BLE::Instance();
+    ble.init(bleInitComplete);
 
     while (true) {
         ble.waitForEvent();