Diff: ZipBeaconConfigService.h

Revision:

7:e9800c45e065

Parent:

6:e90c398b03e0

Child:

10:b5d19bcf23cf

--- a/ZipBeaconConfigService.h	Fri May 15 08:30:08 2015 +0000
+++ b/ZipBeaconConfigService.h	Fri Jun 19 23:50:32 2015 +0000
@@ -17,7 +17,7 @@
 #ifndef SERVICES_ZIPBEACONCONFIGSERVICE_H_
 #define SERVICES_ZIPBEACONCONFIGSERVICE_H_
 
-#include "BLEDevice.h"
+#include "BLE.h"
 #include "mbed.h"
 
 #define UUID_URI_BEACON(FIRST, SECOND) {                         \
@@ -241,8 +241,8 @@
      * characteristics of this service. Attempts to do so are also applied to
      * the internal state of this service object.
      */
-    void onDataWrittenCallback(const GattCharacteristicWriteCBParams *writeParams) {
-        uint16_t handle = writeParams->charHandle;
+    void onDataWrittenCallback(const GattWriteCallbackParams *writeParams) {
+        uint16_t handle = writeParams->handle;
 
         if (handle == lockChar.getValueHandle()) {
             // Validated earlier
@@ -315,7 +315,7 @@
     }
 
   private:
-    void lockAuthorizationCallback(GattCharacteristicWriteAuthCBParams *authParams) {
+    void lockAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
         if (lockedState) {
             authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
         } else if (authParams->len != sizeof(Lock_t)) {
@@ -328,7 +328,7 @@
     }
 
 
-    void unlockAuthorizationCallback(GattCharacteristicWriteAuthCBParams *authParams) {
+    void unlockAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
         if (!lockedState) {
             authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
         } else if (authParams->len != sizeof(Lock_t)) {
@@ -342,7 +342,7 @@
         }
     }
 
-    void uriDataWriteAuthorizationCallback(GattCharacteristicWriteAuthCBParams *authParams) {
+    void uriDataWriteAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
         if (lockedState) {
             authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
         } else if (authParams->offset != 0) {
@@ -352,7 +352,7 @@
         }
     }
 
-    void powerModeAuthorizationCallback(GattCharacteristicWriteAuthCBParams *authParams) {
+    void powerModeAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
         if (lockedState) {
             authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
         } else if (authParams->len != sizeof(uint8_t)) {
@@ -367,7 +367,7 @@
     }
 
     template <typename T>
-    void basicAuthorizationCallback(GattCharacteristicWriteAuthCBParams *authParams) {
+    void basicAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
         if (lockedState) {
             authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
         } else if (authParams->len != sizeof(T)) {