Lancaster University / nRF51822

Clone of the nRF51822 repository from github The correct home is https://github.com/lancaster-university/nRF51822

Dependencies:   nrf51-sdk

Dependents:   microbit-dal microbit-ble-open microbit-dal-eddystone microbit-dal-ble-accelerometer-example ... more

Diff: btle/custom/custom_helper.cpp

Revision:
370:295f76db798e
Parent:
362:6fa0d4d555f6
Child:
371:8f7d2137727a
diff -r 7455428e5ddb -r 295f76db798e btle/custom/custom_helper.cpp
--- a/btle/custom/custom_helper.cpp	Thu Jul 02 09:08:45 2015 +0100
+++ b/btle/custom/custom_helper.cpp	Mon Jul 06 10:13:26 2015 +0100
@@ -200,7 +200,7 @@
 error_t custom_add_in_characteristic(uint16_t                  service_handle,
                                      ble_uuid_t               *p_uuid,
                                      uint8_t                   properties,
-                                     SecurityManager::SecurityMode_t       requiredSecurity,
+                                     Gap::SecurityMode_t       requiredSecurity,
                                      uint8_t                  *p_data,
                                      uint16_t                  min_length,
                                      uint16_t                  max_length,
@@ -246,19 +246,19 @@
 
     if (char_props.read || char_props.notify || char_props.indicate) {
         switch (requiredSecurity) {
-            case SecurityManager::SECURITY_MODE_ENCRYPTION_OPEN_LINK :
+            case Gap::SECURITY_MODE_ENCRYPTION_OPEN_LINK :
                 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.read_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_ENCRYPTION_NO_MITM :
+            case Gap::SECURITY_MODE_ENCRYPTION_NO_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_ENC_NO_MITM(&attr_md.read_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_ENCRYPTION_WITH_MITM :
+            case Gap::SECURITY_MODE_ENCRYPTION_WITH_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_ENC_WITH_MITM(&attr_md.read_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_SIGNED_NO_MITM :
+            case Gap::SECURITY_MODE_SIGNED_NO_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_NO_MITM(&attr_md.read_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_SIGNED_WITH_MITM :
+            case Gap::SECURITY_MODE_SIGNED_WITH_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_WITH_MITM(&attr_md.read_perm);
                 break;
             default:
@@ -268,19 +268,19 @@
 
     if (char_props.write || char_props.write_wo_resp) {
         switch (requiredSecurity) {
-            case SecurityManager::SECURITY_MODE_ENCRYPTION_OPEN_LINK :
+            case Gap::SECURITY_MODE_ENCRYPTION_OPEN_LINK :
                 BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.write_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_ENCRYPTION_NO_MITM :
+            case Gap::SECURITY_MODE_ENCRYPTION_NO_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_ENC_NO_MITM(&attr_md.write_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_ENCRYPTION_WITH_MITM :
+            case Gap::SECURITY_MODE_ENCRYPTION_WITH_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_ENC_WITH_MITM(&attr_md.write_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_SIGNED_NO_MITM :
+            case Gap::SECURITY_MODE_SIGNED_NO_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_NO_MITM(&attr_md.write_perm);
                 break;
-            case SecurityManager::SECURITY_MODE_SIGNED_WITH_MITM :
+            case Gap::SECURITY_MODE_SIGNED_WITH_MITM :
                 BLE_GAP_CONN_SEC_MODE_SET_SIGNED_WITH_MITM(&attr_md.write_perm);
                 break;
             default: