Diff: main.cpp

Revision:

15:57860d1cd14d

Parent:

14:677ef88025b8

Child:

18:86ccdd5a2bfd

--- a/main.cpp	Tue Sep 29 12:10:38 2015 +0000
+++ b/main.cpp	Wed Dec 30 09:41:47 2015 +0000
@@ -15,20 +15,22 @@
  */
 
 #include "mbed.h"
-#include "BLE.h"
-#include "HealthThermometerService.h"
+#include "ble/BLE.h"
+#include "ble/services/HealthThermometerService.h"
 
-BLE        ble;
 DigitalOut led1(LED1);
 
-const static char     DEVICE_NAME[]        = "Therm";
+static HealthThermometerService *thermometerServicePtr;
+
+static const char     DEVICE_NAME[]        = "Therm";
 static const uint16_t uuid16_list[]        = {GattService::UUID_HEALTH_THERMOMETER_SERVICE};
 static volatile bool  triggerSensorPolling = false;
+static float          currentTemperature   = 39.6;
 
 /* Restart Advertising on disconnection*/
 void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
 {
-    ble.gap().startAdvertising();
+    BLE::Instance().gap().startAdvertising();
 }
 
 void periodicCallback(void)
@@ -40,18 +42,40 @@
     triggerSensorPolling = true;
 }
 
-int main(void)
+/**
+ * This function is called when the ble initialization process has failed
+ */
+void onBleInitError(BLE &ble, ble_error_t error)
 {
-    led1 = 1;
-    Ticker ticker;
-    ticker.attach(periodicCallback, 1);
+    /* Avoid compiler warnings */
+    (void) ble;
+    (void) error;
+    /* Initialization error handling should go here */
+}
 
-    ble.init();
+/**
+ * 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().onDisconnection(disconnectionCallback);
 
     /* Setup primary service. */
-    float currentTemperature = 39.6;
-    HealthThermometerService thermometerService(ble, currentTemperature, HealthThermometerService::LOCATION_EAR);
+    thermometerServicePtr = new HealthThermometerService(ble, currentTemperature, HealthThermometerService::LOCATION_EAR);
 
     /* setup advertising */
     ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
@@ -60,21 +84,29 @@
     ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)DEVICE_NAME, sizeof(DEVICE_NAME));
     ble.gap().setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
     ble.gap().setAdvertisingInterval(1000); /* 1000ms */
-    ble.gap().startAdvertising();
+    ble.gap().startAdvertising();    
+}
+
+int main(void)
+{
+    led1 = 1;
+    Ticker ticker;
+    ticker.attach(periodicCallback, 1);
+
+    BLE &ble = BLE::Instance();
+    ble.init(bleInitComplete);
+    
+    /* SpinWait for initialization to complete. This is necessary because the
+     * BLE object is used in the main loop below. */
+    while (ble.hasInitialized()  == false) { /* spin loop */ }
 
     while (true) {
-        if (triggerSensorPolling && ble.getGapState().connected) {
+        if (triggerSensorPolling && ble.gap().getState().connected) {
             triggerSensorPolling = false;
 
-            /* Do blocking calls or whatever is necessary for sensor polling. */
-            // error = sensor.readData();
-            // if (!error) {
-            //     thermometerService.updateTemperature(c);
-            // }
-
             /* In our case, we simply update the dummy temperature measurement. */
             currentTemperature += 0.1;
-            thermometerService.updateTemperature(currentTemperature);
+            thermometerServicePtr->updateTemperature(currentTemperature);
         } else {
             ble.waitForEvent();
         }