Lancaster University / BLE_API

Lancaster University's fork of the mbed BLE API. Lives on github, https://github.com/lancaster-university/BLE_API

Dependents:   microbit-dal microbit-dal microbit-ble-open microbit-dal ... more

Fork of BLE_API by Bluetooth Low Energy

Files at this revision

API Documentation at this revision

Revision 843:7d22b29f91bf, committed 2015-11-02

Comitter:
rgrover1
Date:
Mon Nov 02 09:09:04 2015 +0000
Parent:
842:4f7f7a4b0cb2
Child:
844:96aedb87cdd4
Commit message:
Synchronized with git rev 84f434a9
Author: Rohit Grover
Fix compiler warnings due to header includes.
Some header include paths have diverged between mbed OS and mbed-classic.

Changed in this revision

ble/BLE.h Show annotated file Show diff for this revision Revisions of this file
ble/services/UARTService.h Show annotated file Show diff for this revision Revisions of this file
ble/services/URIBeaconConfigService.h Show annotated file Show diff for this revision Revisions of this file 
--- a/ble/BLE.h	Mon Nov 02 09:09:04 2015 +0000
+++ b/ble/BLE.h	Mon Nov 02 09:09:04 2015 +0000
@@ -23,7 +23,11 @@
 #include "GattClient.h"
 #include "BLEInstanceBase.h"
 
+#ifdef YOTTA_CFG_MBED_OS
+#include "mbed-drivers/mbed_error.h"
+#else
 #include "mbed_error.h"
+#endif
 
 /**
  * The base class used to abstract away BLE capable radio transceivers or SOCs,

--- a/ble/services/UARTService.h	Mon Nov 02 09:09:04 2015 +0000
+++ b/ble/services/UARTService.h	Mon Nov 02 09:09:04 2015 +0000
@@ -17,8 +17,13 @@
 #ifndef __BLE_UART_SERVICE_H__
 #define __BLE_UART_SERVICE_H__
 
+#ifdef YOTTA_CFG_MBED_OS
+#include "mbed-drivers/mbed.h"
+#include "mbed-drivers/Stream.h"
+#else
 #include "mbed.h"
 #include "Stream.h"
+#endif
 
 #include "ble/UUID.h"
 #include "ble/BLE.h"

--- a/ble/services/URIBeaconConfigService.h	Mon Nov 02 09:09:04 2015 +0000
+++ b/ble/services/URIBeaconConfigService.h	Mon Nov 02 09:09:04 2015 +0000
@@ -18,7 +18,12 @@
 #define SERVICES_URIBEACONCONFIGSERVICE_H_
 
 #include "ble/BLE.h"
+
+#ifdef YOTTA_CFG_MBED_OS
+#include "mbed-drivers/mbed.h"
+#else
 #include "mbed.h"
+#endif
 
 extern const uint8_t UUID_URI_BEACON_SERVICE[UUID::LENGTH_OF_LONG_UUID];
 extern const uint8_t UUID_LOCK_STATE_CHAR[UUID::LENGTH_OF_LONG_UUID];