Revision 25:5ac5f1d1a11e, committed 2015-07-24

Comitter:

Timmmm

Date:

Fri Jul 24 18:43:36 2015 +0000

Parent:

24:cd6703df9501

Commit message:

Update for latest nRF51822 repo.

Changed in this revision

diff -r cd6703df9501 -r 5ac5f1d1a11e BLE_API.lib
--- a/BLE_API.lib	Mon Mar 09 13:38:22 2015 +0000
+++ b/BLE_API.lib	Fri Jul 24 18:43:36 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/#1956023d42fb
+http://mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/#4cd3b18607ec

diff -r cd6703df9501 -r 5ac5f1d1a11e Puck.h
--- a/Puck.h	Mon Mar 09 13:38:22 2015 +0000
+++ b/Puck.h	Fri Jul 24 18:43:36 2015 +0000
@@ -18,7 +18,7 @@
 #ifndef __PUCK_HPP__
 #define __PUCK_HPP__
  
-#include "BLEDevice.h"
+#include "BLE.h"
 #include "mbed.h"
 #include "Log.h"
 #include <vector>
@@ -97,16 +97,13 @@
     Puck::getPuck().setState(DISCONNECTED);
 }
 
-void onConnection(Gap::Handle_t handle,
-        Gap::addr_type_t peerAddrType,
-        const Gap::address_t peerAddr,
-        const Gap::ConnectionParams_t * connectionParams) {
+void onConnection(const Gap::ConnectionCallbackParams_t *params) {
     LOG_INFO("Connected.\n");
     Puck::getPuck().setState(CONNECTED);
 }
 
-void onDataWrittenCallback(const GattCharacteristicWriteCBParams *context) {
-    Puck::getPuck().onDataWritten(context->charHandle, context->data, context->len);
+void onDataWrittenCallback(const GattWriteCallbackParams *params) {
+    Puck::getPuck().onDataWritten(params->handle, params->data, params->len);
 }
 
 bool isEqualUUID(const UUID* uuidA, const UUID uuidB) {

diff -r cd6703df9501 -r 5ac5f1d1a11e nRF51822.lib
--- a/nRF51822.lib	Mon Mar 09 13:38:22 2015 +0000
+++ b/nRF51822.lib	Fri Jul 24 18:43:36 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/Nordic-Semiconductor/code/nRF51822/#0e7a9efee6d7
+http://mbed.org/teams/Nordic-Semiconductor/code/nRF51822/#c7adea3c1e37