Diff: main.cpp

Revision:

5:ed2cb43f3589

Parent:

3:b852bf8d6fad

Child:

6:715150f7f293

--- a/main.cpp	Mon Jun 08 10:08:09 2015 +0000
+++ b/main.cpp	Fri Jun 19 23:57:59 2015 +0000
@@ -15,7 +15,7 @@
  */
 
 #include "mbed.h"
-#include "BLEDevice.h"
+#include "BLE.h"
 #include "HeartRateSecService.h"
 #include "DeviceInformationService.h"
 
@@ -42,14 +42,12 @@
     triggerSensorPolling = true;
 }
 
-void connectionCallback(Gap::Handle_t handle, Gap::addr_type_t peerAddrType, const Gap::Address_t peerAddr,
-                        Gap::addr_type_t ownAddrType,  const Gap::Address_t ownAddr,
-                        const Gap::ConnectionParams_t * pParam)
+void connectionCallback(const Gap::ConnectionCallbackParams_t *params)
 {
     printf("Connected!\r\n");
 }
 
-void passkeyDisplayCallback(Gap::Handle_t handle, const Gap::Passkey_t passkey)
+void passkeyDisplayCallback(Gap::Handle_t handle, const SecurityManager::Passkey_t passkey)
 {
     printf("Input passKey: ");
     for (unsigned i = 0; i < Gap::ADDR_LEN; i++) {
@@ -58,9 +56,9 @@
     printf("\r\n");
 }
 
-void securitySetupCompletedCallback(Gap::Handle_t handle, Gap::SecurityCompletionStatus_t status)
+void securitySetupCompletedCallback(Gap::Handle_t handle, SecurityManager::SecurityCompletionStatus_t status)
 {
-    if (status == Gap::SEC_STATUS_SUCCESS) {
+    if (status == SecurityManager::SEC_STATUS_SUCCESS) {
         printf("Security success\r\n", status);
     } else {
         printf("Security failed\r\n", status);
@@ -79,7 +77,7 @@
     /* Initialize BLE security */
     bool enableBonding = true;
     bool requireMITM   = true;
-    ble.initializeSecurity(enableBonding, requireMITM, Gap::IO_CAPS_DISPLAY_ONLY);
+    ble.initializeSecurity(enableBonding, requireMITM, SecurityManager::IO_CAPS_DISPLAY_ONLY);
     
     /* Set callback functions */
     ble.onConnection(connectionCallback);