Revision 146:543877bb1f52, committed 2014-11-28

Comitter:

rgrover1

Date:

Fri Nov 28 14:11:19 2014 +0000

Parent:

145:a7ded9ad83c8

Child:

147:f772d9b93808

Commit message:

Synchronized with git rev e8e3a7aa
Author: Rohit Grover
add Gap::MSEC_TO_ADVERTISEMENT_DURATION_UNITS()

Changed in this revision

--- a/README.md	Fri Nov 21 09:23:25 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# mbed Bluetooth Low Energy Stack
-This is the github repo for the BLE_API used by developer.mbed.org .  The BLE stack is under development and constantly evolving. For up to date documentation please see [the mbed BLE Documentation page](http://developer.mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/docs/tip/).  
-
-# Supported Services
-Supported GATT services and constantly being added and can be found in the /services folder.
-Currently supported  services include:
-* Battery 
-* Device Firmware Update (DFU)
-* Device Information 
-* Health Thermometer
-* Heart Rate
-* UART
-
-# Getting Started 
-The mbed BLE API is meant to be used in projects on developer.mbed.org. Please see examples and sample project files there. 
-A good starting point are these pages:
-* [mbed BLE API](developer.mbed.org/teams/Bluetooth-Low-Energy/)
-* [mbed BLE Getting Started Guide](http://developer.mbed.org/forum/team-63-Bluetooth-Low-Energy-community/topic/5262/)
\ No newline at end of file

--- a/common/blecommon.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/common/blecommon.h	Fri Nov 28 14:11:19 2014 +0000
@@ -27,7 +27,6 @@
 #endif
 
 #include <stdint.h>
-#include <stddef.h>
 
 /** @defgroup BLE_UUID_VALUES Assigned Values for BLE UUIDs
  * @{ */

--- a/public/BLEDevice.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/public/BLEDevice.h	Fri Nov 28 14:11:19 2014 +0000
@@ -17,6 +17,7 @@
 #ifndef __BLE_DEVICE__
 #define __BLE_DEVICE__
 
+#include "mbed.h"
 #include "blecommon.h"
 #include "Gap.h"
 #include "GattServer.h"

--- a/public/CallChainOfFunctionPointersWithContext.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/public/CallChainOfFunctionPointersWithContext.h	Fri Nov 28 14:11:19 2014 +0000
@@ -19,6 +19,7 @@
 #include <string.h>
 #include "FunctionPointerWithContext.h"
 
+namespace mbed {
 
 /** Group one or more functions in an instance of a CallChainOfFunctionPointersWithContext, then call them in
  * sequence using CallChainOfFunctionPointersWithContext::call(). Used mostly by the interrupt chaining code,
@@ -26,6 +27,7 @@
  *
  * Example:
  * @code
+ * #include "mbed.h"
  *
  * CallChainOfFunctionPointersWithContext<void *> chain;
  *
@@ -146,4 +148,6 @@
     CallChainOfFunctionPointersWithContext & operator = (const CallChainOfFunctionPointersWithContext &);
 };
 
-#endif
\ No newline at end of file
+} // namespace mbed
+
+#endif

--- a/public/FunctionPointerWithContext.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/public/FunctionPointerWithContext.h	Fri Nov 28 14:11:19 2014 +0000
@@ -19,6 +19,7 @@
 
 #include <string.h>
 
+namespace mbed {
 
 /** A class for storing and calling a pointer to a static or member void function
  *  which takes a context.
@@ -125,5 +126,6 @@
                                                          *   external memory to manage the chain. Also refer to
                                                          *   'CallChain' as an alternative. */
 };
+} // namespace mbed
 
 #endif // ifndef MBED_FUNCTIONPOINTER_WITH_CONTEXT_H
\ No newline at end of file

--- a/public/Gap.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/public/Gap.h	Fri Nov 28 14:11:19 2014 +0000
@@ -61,10 +61,14 @@
         uint16_t connectionSupervisionTimeout; /**< Connection Supervision Timeout in 10 ms units, see @ref BLE_GAP_CP_LIMITS.*/
     } ConnectionParams_t;
 
-    static const uint16_t UNIT_1_25_MS = 1250; /**< Number of microseconds in 1.25 milliseconds. */
+    static const uint16_t UNIT_1_25_MS  = 1250; /**< Number of microseconds in 1.25 milliseconds. */
+    static const uint16_t UNIT_0_625_MS = 650;  /**< Number of microseconds in 0.625 milliseconds. */
     static uint16_t MSEC_TO_GAP_DURATION_UNITS(uint32_t durationInMillis) {
         return (durationInMillis * 1000) / UNIT_1_25_MS;
     }
+    static uint16_t MSEC_TO_ADVERTISEMENT_DURATION_UNITS(uint32_t durationInMillis) {
+        return (durationInMillis * 1000) / UNIT_0_625_MS;
+    }
 
     typedef void (*EventCallback_t)(void);
     typedef void (*ConnectionEventCallback_t)(Handle_t, addr_type_t peerAddrType, const address_t peerAddr, const ConnectionParams_t *);

--- a/public/GapEvents.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/public/GapEvents.h	Fri Nov 28 14:11:19 2014 +0000
@@ -18,6 +18,7 @@
 #define __GAP_EVENTS_H__
 
 #include "blecommon.h"
+#include "mbed.h"
 
 /**************************************************************************/
 /*!

--- a/public/GattServerEvents.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/public/GattServerEvents.h	Fri Nov 28 14:11:19 2014 +0000
@@ -18,6 +18,7 @@
 #define __GATT_SERVER_EVENTS_H__
 
 #include "blecommon.h"
+#include "mbed.h"
 
 /**************************************************************************/
 /*!

--- a/services/UARTService.h	Fri Nov 21 09:23:25 2014 +0000
+++ b/services/UARTService.h	Fri Nov 28 14:11:19 2014 +0000
@@ -17,7 +17,6 @@
 #ifndef __BLE_UART_SERVICE_H__
 #define __BLE_UART_SERVICE_H__
 
-#include "mbed.h"
 #include "Stream.h"
 
 #include "UUID.h"