Jackson Lv / nRF51822

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   nrf51-sdk

Dependents:   BLENano_Mesh

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 614:cf574a4ebbcc, committed 2016-01-12

Comitter:
vcoubard
Date:
Tue Jan 12 19:58:02 2016 +0000
Parent:
613:cbc548e9df98
Child:
615:1751e2e2637a
Commit message:
Synchronized with git rev 2f875c9c
Author: Vincent Coubard
Merge pull request #103 from andresag01/bond-table-query

Finish implementation of getAddressesFromBondTable

Changed in this revision

source/nRF5xGap.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nRF5xGap.cpp	Tue Jan 12 19:58:02 2016 +0000
+++ b/source/nRF5xGap.cpp	Tue Jan 12 19:58:02 2016 +0000
@@ -686,7 +686,7 @@
 
     /* Test for invalid parameters before we change the internal state */
     for (uint8_t i = 0; i < whitelistIn.size; ++i) {
-        if (whitelistIn.addresses[i].type == BLEProtocol::AddressType::RANDOM_PRIVATE_NON_RESOLVABLE) {
+        if (whitelistIn.addresses[i].type == BLEProtocol::AddressType_t::RANDOM_PRIVATE_NON_RESOLVABLE) {
             /* This is not allowed because it is completely meaningless */
             return BLE_ERROR_INVALID_PARAM;
         }
@@ -903,7 +903,7 @@
     whitelist.irk_count  = 0;
     whitelist.addr_count = 0;
     for (uint8_t i = 0; i < whitelistAddressesSize; ++i) {
-        if (whitelistAddresses[i].addr_type == BLEProtocol::AddressType::RANDOM_PRIVATE_RESOLVABLE) {
+        if (whitelistAddresses[i].addr_type == BLEProtocol::AddressType_t::RANDOM_PRIVATE_RESOLVABLE) {
             /* Test if there is a matching IRK for this private resolvable address */
             for (uint8_t j = 0; j < whitelistFromBondTable.irk_count; ++j) {
                 if (securityManager.matchAddressAndIrk(&whitelistAddresses[i], whitelistFromBondTable.pp_irks[j])) {