Merge branch 'ble-bondtable-size-fix'

This commit is contained in:
Joe Finney 2016-02-07 20:43:02 +00:00
commit 260c05782e
2 changed files with 3 additions and 3 deletions

View file

@ -15,8 +15,8 @@
"homepage": "https://developer.mbed.org/teams/Lancaster-University/code/microbit/",
"dependencies": {
"mbed-classic": "lancaster-university/mbed-classic#microbit_hfclk",
"ble": "lancaster-university/BLE_API#v2.5.0+mb",
"ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb2",
"ble": "lancaster-university/BLE_API#v2.5.0+mb2",
"ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb4",
"nrf51-sdk": "lancaster-university/nrf51-sdk#v2.2.0+mb2"
},
"extraIncludes": [

View file

@ -330,7 +330,7 @@ int MicroBitBLEManager::getBondCount()
whitelist.capacity = MICROBIT_BLE_MAXIMUM_BONDS;
ble->securityManager().getAddressesFromBondTable(whitelist);
return whitelist.size;
return whitelist.bonds;
}
/**