Diff: main.cpp

Revision:

11:16f67d5752e1

Parent:

9:69a2ad0bcdb7

Child:

12:f4b869da449c

--- a/main.cpp	Tue Sep 29 12:08:57 2015 +0000
+++ b/main.cpp	Tue Jan 12 10:20:26 2016 +0000
@@ -19,8 +19,8 @@
 #include "ble/BLE.h"
 #include "TMP_nrf51/TMP_nrf51.h"
 
-BLE        ble;
 DigitalOut alivenessLED(LED1, 1);
+Ticker     ticker;
 
 void periodicCallback(void)
 {
@@ -64,14 +64,44 @@
     }
 }
 
+/**
+ * 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;
+    }
+
+    /* Setup and start scanning */
+    ble.gap().setScanParams(1800 /* scan interval */, 1500 /* scan window */);
+    ble.gap().startScan(advertisementCallback);
+}
+
 int main(void)
 {
-    Ticker ticker;
-    ticker.attach(periodicCallback, 1);
+    ticker.attach(periodicCallback, 1);  /* trigger sensor polling every 2 seconds */
 
-    ble.init();
-    ble.gap().setScanParams(1800 /* scan interval */, 1500 /* scan window */);
-    ble.gap().startScan(advertisementCallback);
+    BLE &ble = BLE::Instance();
+    ble.init(bleInitComplete);
 
     while (true) {
         ble.waitForEvent();