Diff: main.cpp

Revision:

26:a2396234b4a8

Parent:

24:2c2555bb5cba

Child:

27:b04a54f57356

--- a/main.cpp	Thu Jul 02 08:40:45 2015 +0000
+++ b/main.cpp	Tue Jul 14 08:27:14 2015 +0000
@@ -15,10 +15,10 @@
  */
 
 #include "mbed.h"
-#include "BLE.h"
-#include "URIBeaconConfigService.h"
-#include "DFUService.h"
-#include "DeviceInformationService.h"
+#include "ble/BLE.h"
+#include "ble/services/URIBeaconConfigService.h"
+#include "ble/services/DFUService.h"
+#include "ble/services/DeviceInformationService.h"
 #include "ConfigParamsPersistence.h"
 
 BLE ble;
@@ -45,7 +45,7 @@
     state = ble.getGapState();
     if (!state.connected) { /* don't switch if we're in a connected state. */
         uriBeaconConfig->setupURIBeaconAdvertisements();
-        ble.gap().startAdvertising();
+        ble.startAdvertising();
 
         configAdvertisementTimeoutTicker.detach(); /* disable the callback from the timeout Ticker. */
     }
@@ -56,13 +56,13 @@
  */
 void disconnectionCallback(Gap::Handle_t handle, Gap::DisconnectionReason_t reason)
 {
-    ble.gap().startAdvertising();
+    ble.startAdvertising();
 }
 
 int main(void)
 {
     ble.init();
-    ble.gap().onDisconnection(disconnectionCallback);
+    ble.onDisconnection(disconnectionCallback);
 
     /*
      * Load parameters from (platform specific) persistent storage. Parameters
@@ -86,8 +86,8 @@
     DFUService dfu(ble);
     DeviceInformationService deviceInfo(ble, "ARM", "UriBeacon", "SN1", "hw-rev1", "fw-rev1", "soft-rev1");
 
-    ble.gap().startAdvertising(); /* Set the whole thing in motion. After this call a GAP central can scan the URIBeaconConfig
-                                   * service. This can then be switched to the normal URIBeacon functionality after a timeout. */
+    ble.startAdvertising(); /* Set the whole thing in motion. After this call a GAP central can scan the URIBeaconConfig
+                             * service. This can then be switched to the normal URIBeacon functionality after a timeout. */
 
     while (true) {
         ble.waitForEvent();