From 8e3e061becea8ec6947d151f8974a814fc967a61 Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Sun, 7 Feb 2016 19:59:56 +0000 Subject: [PATCH 1/2] microbit: BUGFIX Fixed incorrect bond table entry count The nordic implementation of the mbed whitelist API introduces entries into the table that are not bonds. This patch corrects an assumption in microbit-dal that the number of entries in the bond table table corellates with the number of bonds. --- source/ble-services/MicroBitBLEManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ble-services/MicroBitBLEManager.cpp b/source/ble-services/MicroBitBLEManager.cpp index 77f9e7c..757a47d 100644 --- a/source/ble-services/MicroBitBLEManager.cpp +++ b/source/ble-services/MicroBitBLEManager.cpp @@ -330,7 +330,7 @@ int MicroBitBLEManager::getBondCount() whitelist.capacity = MICROBIT_BLE_MAXIMUM_BONDS; ble->securityManager().getAddressesFromBondTable(whitelist); - return whitelist.size; + return whitelist.bonds; } /** From ecf0bea87cbe14e2dc09053f559b42021bfc7991 Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Sun, 7 Feb 2016 20:41:38 +0000 Subject: [PATCH 2/2] microbit: Update module version dependencies --- module.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module.json b/module.json index a82aeb8..c814e1b 100644 --- a/module.json +++ b/module.json @@ -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": [