Revision 853:2e829bcda785, committed 2015-11-02

Comitter:

rgrover1

Date:

Mon Nov 02 09:09:06 2015 +0000

Parent:

852:f0de1349300c

Child:

854:ad4ae73c2b5a

Commit message:

Synchronized with git rev bde2e465
Author: Rohit Grover
fix #86: update includes from within services to use paths starting from subfolder 'ble'

Changed in this revision

--- a/ble/BLE.h	Mon Nov 02 09:09:06 2015 +0000
+++ b/ble/BLE.h	Mon Nov 02 09:09:06 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/BLEInstanceBase.h	Mon Nov 02 09:09:06 2015 +0000
+++ b/ble/BLEInstanceBase.h	Mon Nov 02 09:09:06 2015 +0000
@@ -18,6 +18,7 @@
 #define __BLE_DEVICE_INSTANCE_BASE__
 
 #include "Gap.h"
+#include "ble/SecurityManager.h"
 
 /* forward declarations */
 class GattServer;

--- a/ble/UUID.h	Mon Nov 02 09:09:06 2015 +0000
+++ b/ble/UUID.h	Mon Nov 02 09:09:06 2015 +0000
@@ -74,7 +74,7 @@
      *
      * @note we don't yet support 32-bit shortened UUIDs.
      */
-    UUID(ShortUUIDBytes_t shortUUID) : type(UUID_TYPE_SHORT), baseUUID(), shortUUID(shortUUID) {
+    UUID(ShortUUIDBytes_t _shortUUID) : type(UUID_TYPE_SHORT), baseUUID(), shortUUID(_shortUUID) {
         /* empty */
     }
 

--- a/ble/services/LinkLossService.h	Mon Nov 02 09:09:06 2015 +0000
+++ b/ble/services/LinkLossService.h	Mon Nov 02 09:09:06 2015 +0000
@@ -17,7 +17,7 @@
 #ifndef __BLE_LINK_LOSS_SERVICE_H__
 #define __BLE_LINK_LOSS_SERVICE_H__
 
-#include "Gap.h"
+#include "ble/Gap.h"
 
 /**
 * @class LinkLossService

--- a/ble/services/UARTService.h	Mon Nov 02 09:09:06 2015 +0000
+++ b/ble/services/UARTService.h	Mon Nov 02 09:09:06 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:06 2015 +0000
+++ b/ble/services/URIBeaconConfigService.h	Mon Nov 02 09:09:06 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];

--- a/module.json	Mon Nov 02 09:09:06 2015 +0000
+++ b/module.json	Mon Nov 02 09:09:06 2015 +0000
@@ -1,10 +1,12 @@
 {
   "name": "ble",
-  "version": "0.4.8",
+  "version": "1.0.0",
   "description": "The BLE module offers a high level abstraction for using Bluetooth Low Energy on multiple platforms.",
   "keywords": [
     "Bluetooth",
-    "BLE"
+    "BLE",
+    "mbed",
+    "mbed-official"
   ],
   "author": "Rohit Grover",
   "repository": {
@@ -20,8 +22,14 @@
   ],
   "dependencies": {},
   "targetDependencies": {
+    "st-ble-shield": {
+      "x-nucleo-idb0xa1": "ARMmbed/ble-x-nucleo-idb0xa1"
+    },
     "nrf51822": {
-      "ble-nrf51822": "~0.4.7"
+      "ble-nrf51822": "^1.0.0"
+    },
+    "cordio": {
+      "ble-wicentric": "~0.0.0"
     },
     "mbed-classic": {
       "mbed-classic": "~0.0.1"