Revision 75:739b6a1c1b50, committed 2017-07-17

Comitter:

wwbluetooth

Date:

Mon Jul 17 20:49:56 2017 +0000

Parent:

74:a8f5674a0079

Child:

76:1eb7931c1b55

Commit message:

sdf

Changed in this revision

--- a/inc/bluetooth/MicroBitEddystone.h	Wed Feb 08 07:49:17 2017 +0000
+++ b/inc/bluetooth/MicroBitEddystone.h	Mon Jul 17 20:49:56 2017 +0000
@@ -75,7 +75,7 @@
 
 #endif
 
-#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_UID)
+//#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_UID)
     /**
       * Set the content of Eddystone UID frames
       *
@@ -88,8 +88,8 @@
       * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
       * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
       */
-    int setUID(BLEDevice* ble, const char* uid_namespace, const char* uid_instance, int8_t calibratedPower = 0xF0);
-#endif
+//    int setUID(BLEDevice* ble, const char* uid_namespace, const char* uid_instance, int8_t calibratedPower = 0xF0);
+//#endif
 
   private:
 

--- a/mbed-dev-bin.lib	Wed Feb 08 07:49:17 2017 +0000
+++ b/mbed-dev-bin.lib	Mon Jul 17 20:49:56 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Lancaster-University/code/mbed-dev-bin/#768173a57492
+https://developer.mbed.org/teams/Lancaster-University/code/mbed-dev-bin/#97d461b4d444

--- a/nRF51822.lib	Wed Feb 08 07:49:17 2017 +0000
+++ b/nRF51822.lib	Mon Jul 17 20:49:56 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Lancaster-University/code/nRF51822/#b84f72a53341
+https://developer.mbed.org/teams/Lancaster-University/code/nRF51822/#a2dc09d1ad27

--- a/source/bluetooth/MicroBitBLEManager.cpp	Wed Feb 08 07:49:17 2017 +0000
+++ b/source/bluetooth/MicroBitBLEManager.cpp	Mon Jul 17 20:49:56 2017 +0000
@@ -23,6 +23,8 @@
 DEALINGS IN THE SOFTWARE.
 */
 
+
+
 #include "MicroBitConfig.h"
 #include "MicroBitBLEManager.h"
 #include "MicroBitEddystone.h"
@@ -57,20 +59,12 @@
 
 #define MICROBIT_PAIRING_FADE_SPEED 4
 
-//
-// Local enumeration of valid security modes. Used only to optimise pre‐processor comparisons.
-//
-#define __SECURITY_MODE_ENCRYPTION_OPEN_LINK 0
-#define __SECURITY_MODE_ENCRYPTION_NO_MITM 1
-#define __SECURITY_MODE_ENCRYPTION_WITH_MITM 2
-//
 // Some Black Magic to compare the definition of our security mode in MicroBitConfig with a given parameter.
 // Required as the MicroBitConfig option is actually an mbed enum, that is not normally comparable at compile time.
 //
 
 #define __CAT(a, ...) a##__VA_ARGS__
-#define SECURITY_MODE(x) __CAT(__, x)
-#define SECURITY_MODE_IS(x) (SECURITY_MODE(MICROBIT_BLE_SECURITY_LEVEL) == SECURITY_MODE(x))
+
 
 const char *MICROBIT_BLE_MANUFACTURER = NULL;
 const char *MICROBIT_BLE_MODEL = "BBC micro:bit";
@@ -86,140 +80,12 @@
  */
 MicroBitBLEManager *MicroBitBLEManager::manager = NULL; // Singleton reference to the BLE manager. many mbed BLE API callbacks still do not support member funcions yet. :-(
 
-static uint8_t deviceID = 255;          // Unique ID for the peer that has connected to us.
-static Gap::Handle_t pairingHandle = 0; // The connection handle used during a pairing process. Used to ensure that connections are dropped elegantly.
 
-static void storeSystemAttributes(Gap::Handle_t handle)
-{
-    if (MicroBitBLEManager::manager->storage != NULL && deviceID < MICROBIT_BLE_MAXIMUM_BONDS)
-    {
-        ManagedString key("bleSysAttrs");
-
-        KeyValuePair *bleSysAttrs = MicroBitBLEManager::manager->storage->get(key);
-
-        BLESysAttribute attrib;
-        BLESysAttributeStore attribStore;
-
-        uint16_t len = sizeof(attrib.sys_attr);
-
-        sd_ble_gatts_sys_attr_get(handle, attrib.sys_attr, &len, BLE_GATTS_SYS_ATTR_FLAG_SYS_SRVCS);
-
-        //copy our stored sysAttrs
-        if (bleSysAttrs != NULL)
-        {
-            memcpy(&attribStore, bleSysAttrs->value, sizeof(BLESysAttributeStore));
-            delete bleSysAttrs;
-        }
-
-        //check if we need to update
-        if (memcmp(attribStore.sys_attrs[deviceID].sys_attr, attrib.sys_attr, len) != 0)
-        {
-            attribStore.sys_attrs[deviceID] = attrib;
-            MicroBitBLEManager::manager->storage->put(key, (uint8_t *)&attribStore, sizeof(attribStore));
-        }
-    }
-}
-
-/**
-  * Callback when a BLE GATT disconnect occurs.
-  */
-static void bleDisconnectionCallback(const Gap::DisconnectionCallbackParams_t *reason)
-{
-    MicroBitEvent(MICROBIT_ID_BLE, MICROBIT_BLE_EVT_DISCONNECTED);
-
-    storeSystemAttributes(reason->handle);
-
-    if (MicroBitBLEManager::manager)
-        MicroBitBLEManager::manager->advertise();
-}
-
-/**
-  * Callback when a BLE connection is established.
-  */
-static void bleConnectionCallback(const Gap::ConnectionCallbackParams_t *)
-{
-    MicroBitEvent(MICROBIT_ID_BLE, MICROBIT_BLE_EVT_CONNECTED);
-}
-
-/**
-  * Callback when a BLE SYS_ATTR_MISSING.
-  */
-static void bleSysAttrMissingCallback(const GattSysAttrMissingCallbackParams *params)
-{
-    int complete = 0;
-    deviceID = 255;
-
-    dm_handle_t dm_handle = {0, 0, 0, 0};
-
-    int ret = dm_handle_get(params->connHandle, &dm_handle);
-
-    if (ret == 0)
-        deviceID = dm_handle.device_id;
-
-    if (MicroBitBLEManager::manager->storage != NULL && deviceID < MICROBIT_BLE_MAXIMUM_BONDS)
-    {
-        ManagedString key("bleSysAttrs");
-
-        KeyValuePair *bleSysAttrs = MicroBitBLEManager::manager->storage->get(key);
-
-        BLESysAttributeStore attribStore;
-        BLESysAttribute attrib;
-
-        if (bleSysAttrs != NULL)
-        {
-            //restore our sysAttrStore
-            memcpy(&attribStore, bleSysAttrs->value, sizeof(BLESysAttributeStore));
-            delete bleSysAttrs;
-
-            attrib = attribStore.sys_attrs[deviceID];
-
-            ret = sd_ble_gatts_sys_attr_set(params->connHandle, attrib.sys_attr, sizeof(attrib.sys_attr), BLE_GATTS_SYS_ATTR_FLAG_SYS_SRVCS);
-
-            complete = 1;
-
-            if (ret == 0)
-                ret = sd_ble_gatts_service_changed(params->connHandle, 0x000c, 0xffff);
-        }
-    }
-
-    if (!complete)
-        sd_ble_gatts_sys_attr_set(params->connHandle, NULL, 0, 0);
-}
-
-static void passkeyDisplayCallback(Gap::Handle_t handle, const SecurityManager::Passkey_t passkey)
-{
-    (void)handle; /* -Wunused-param */
-
-    ManagedString passKey((const char *)passkey, SecurityManager::PASSKEY_LEN);
-
-    if (MicroBitBLEManager::manager)
-        MicroBitBLEManager::manager->pairingRequested(passKey);
-}
-
-static void securitySetupCompletedCallback(Gap::Handle_t handle, SecurityManager::SecurityCompletionStatus_t status)
-{
-    (void)handle; /* -Wunused-param */
-
-    dm_handle_t dm_handle = {0, 0, 0, 0};
-    int ret = dm_handle_get(handle, &dm_handle);
-
-    if (ret == 0)
-        deviceID = dm_handle.device_id;
-
-    if (MicroBitBLEManager::manager)
-    {
-        pairingHandle = handle;
-        MicroBitBLEManager::manager->pairingComplete(status == SecurityManager::SEC_STATUS_SUCCESS);
-    }
-}
 
 /**
  * Constructor.
- *
  * Configure and manage the micro:bit's Bluetooth Low Energy (BLE) stack.
- *
  * @param _storage an instance of MicroBitStorage used to persist sys attribute information. (This is required for compatability with iOS).
- *
  * @note The BLE stack *cannot*  be brought up in a static context (the software simply hangs or corrupts itself).
  * Hence, the init() member function should be used to initialise the BLE stack.
  */
@@ -232,9 +98,7 @@
 
 /**
  * Constructor.
- *
  * Configure and manage the micro:bit's Bluetooth Low Energy (BLE) stack.
- *
  * @note The BLE stack *cannot*  be brought up in a static context (the software simply hangs or corrupts itself).
  * Hence, the init() member function should be used to initialise the BLE stack.
  */
@@ -271,12 +135,10 @@
 /**
   * Post constructor initialisation method as the BLE stack cannot be brought
   * up in a static context.
-  *
   * @param deviceName The name used when advertising
   * @param serialNumber The serial number exposed by the device information service
   * @param messageBus An instance of an EventModel, used during pairing.
   * @param enableBonding If true, the security manager enabled bonding.
-  *
   * @code
   * bleManager.init(uBit.getName(), uBit.getSerial(), uBit.messageBus, true);
   * @endcode
@@ -286,11 +148,11 @@
     ManagedString BLEName("BBC micro:bit");
     this->deviceName = deviceName;
 
-#if !(CONFIG_ENABLED(MICROBIT_BLE_WHITELIST))
+//wlw #if !(CONFIG_ENABLED(MICROBIT_BLE_WHITELIST))
     ManagedString namePrefix(" [");
     ManagedString namePostfix("]");
     BLEName = BLEName + namePrefix + deviceName + namePostfix;
-#endif
+//wlw #endif
 
 // Start the BLE stack.
 #if CONFIG_ENABLED(MICROBIT_HEAP_REUSE_SD)
@@ -300,12 +162,6 @@
     ble = new BLEDevice();
     ble->init();
 
-    // automatically restart advertising after a device disconnects.
-    ble->gap().onDisconnection(bleDisconnectionCallback);
-    ble->gattServer().onSysAttrMissing(bleSysAttrMissingCallback);
-
-    // generate an event when a Bluetooth connection is established
-    ble->gap().onConnection(bleConnectionCallback);
 
     // Configure the stack to hold onto the CPU during critical timing events.
     // mbed-classic performs __disable_irq() calls in its timers that can cause
@@ -314,55 +170,7 @@
     opt.enable = 1;
     sd_ble_opt_set(BLE_COMMON_OPT_RADIO_CPU_MUTEX, (const ble_opt_t *)&opt);
 
-#if CONFIG_ENABLED(MICROBIT_BLE_PRIVATE_ADDRESSES)
-    // Configure for private addresses, so kids' behaviour can't be easily tracked.
-    ble->gap().setAddress(BLEProtocol::AddressType::RANDOM_PRIVATE_RESOLVABLE, {0});
-#endif
 
-    // Setup our security requirements.
-    ble->securityManager().onPasskeyDisplay(passkeyDisplayCallback);
-    ble->securityManager().onSecuritySetupCompleted(securitySetupCompletedCallback);
-// @bluetooth_mdw: select either passkey pairing (more secure), "just works" pairing (less secure but nice and simple for the user)
-// or no security
-// Default to passkey pairing with MITM protection
-#if (SECURITY_MODE_IS(SECURITY_MODE_ENCRYPTION_NO_MITM))
-    // Just Works
-    ble->securityManager().init(enableBonding, false, SecurityManager::IO_CAPS_NONE);
-#elif (SECURITY_MODE_IS(SECURITY_MODE_ENCRYPTION_OPEN_LINK))
-    // no security
-    ble->securityManager().init(false, false, SecurityManager::IO_CAPS_DISPLAY_ONLY);
-#else
-    // passkey
-    ble->securityManager().init(enableBonding, true, SecurityManager::IO_CAPS_DISPLAY_ONLY);
-#endif
-
-    if (enableBonding)
-    {
-        // If we're in pairing mode, review the size of the bond table.
-        int bonds = getBondCount();
-
-        // TODO: It would be much better to implement some sort of LRU/NFU policy here,
-        // but this isn't currently supported in mbed, so we'd need to layer break...
-
-        // If we're full, empty the bond table.
-        if (bonds >= MICROBIT_BLE_MAXIMUM_BONDS)
-            ble->securityManager().purgeAllBondingState();
-    }
-
-#if CONFIG_ENABLED(MICROBIT_BLE_WHITELIST)
-    // Configure a whitelist to filter all connection requetss from unbonded devices.
-    // Most BLE stacks only permit one connection at a time, so this prevents denial of service attacks.
-    BLEProtocol::Address_t bondedAddresses[MICROBIT_BLE_MAXIMUM_BONDS];
-    Gap::Whitelist_t whitelist;
-    whitelist.addresses = bondedAddresses;
-    whitelist.capacity = MICROBIT_BLE_MAXIMUM_BONDS;
-
-    ble->securityManager().getAddressesFromBondTable(whitelist);
-
-    ble->gap().setWhitelist(whitelist);
-    ble->gap().setScanningPolicyMode(Gap::SCAN_POLICY_IGNORE_WHITELIST);
-    ble->gap().setAdvertisingPolicyMode(Gap::ADV_POLICY_FILTER_CONN_REQS);
-#endif
 
     // Configure the radio at our default power level
     setTransmitPower(MICROBIT_BLE_DEFAULT_TX_POWER);
@@ -384,13 +192,6 @@
     (void)messageBus;
 #endif
 
-    // Configure for high speed mode where possible.
-    Gap::ConnectionParams_t fast;
-    ble->getPreferredConnectionParams(&fast);
-    fast.minConnectionInterval = 8;  // 10 ms
-    fast.maxConnectionInterval = 16; // 20 ms
-    fast.slaveLatency = 0;
-    ble->setPreferredConnectionParams(&fast);
 
 // Setup advertising.
 #if CONFIG_ENABLED(MICROBIT_BLE_WHITELIST)
@@ -407,22 +208,13 @@
     ble->gap().setAdvertisingTimeout(MICROBIT_BLE_ADVERTISING_TIMEOUT);
 #endif
 
-// If we have whitelisting enabled, then prevent only enable advertising of we have any binded devices...
-// This is to further protect kids' privacy. If no-one initiates BLE, then the device is unreachable.
-// If whiltelisting is disabled, then we always advertise.
-#if CONFIG_ENABLED(MICROBIT_BLE_WHITELIST)
-    if (whitelist.size > 0)
-#endif
-        ble->startAdvertising();
 }
 
+
 /**
  * Change the output power level of the transmitter to the given value.
- *
  * @param power a value in the range 0..7, where 0 is the lowest power and 7 is the highest.
- *
  * @return MICROBIT_OK on success, or MICROBIT_INVALID_PARAMETER if the value is out of range.
- *
  * @code
  * // maximum transmission power.
  * bleManager.setTransmitPower(7);
@@ -439,53 +231,8 @@
     return MICROBIT_OK;
 }
 
-/**
- * Determines the number of devices currently bonded with this micro:bit.
- * @return The number of active bonds.
- */
-int MicroBitBLEManager::getBondCount()
-{
-    BLEProtocol::Address_t bondedAddresses[MICROBIT_BLE_MAXIMUM_BONDS];
-    Gap::Whitelist_t whitelist;
-    whitelist.addresses = bondedAddresses;
-    whitelist.capacity = MICROBIT_BLE_MAXIMUM_BONDS;
-    ble->securityManager().getAddressesFromBondTable(whitelist);
-
-    return whitelist.bonds;
-}
 
-/**
- * A request to pair has been received from a BLE device.
- * If we're in pairing mode, display the passkey to the user.
- * Also, purge the bonding table if it has reached capacity.
- *
- * @note for internal use only.
- */
-void MicroBitBLEManager::pairingRequested(ManagedString passKey)
-{
-    // Update our mode to display the passkey.
-    this->passKey = passKey;
-    this->pairingStatus = MICROBIT_BLE_PAIR_REQUEST;
-}
 
-/**
- * A pairing request has been sucessfully completed.
- * If we're in pairing mode, display a success or failure message.
- *
- * @note for internal use only.
- */
-void MicroBitBLEManager::pairingComplete(bool success)
-{
-    this->pairingStatus = MICROBIT_BLE_PAIR_COMPLETE;
-
-    pairing_completed_at_time = system_timer_current_time();
-
-    if (success)
-    {
-        this->pairingStatus |= MICROBIT_BLE_PAIR_SUCCESSFUL;
-        fiber_add_idle_component(this);
-    }
-}
 
 /**
  * Periodic callback in thread context.
@@ -493,13 +240,8 @@
  */
 void MicroBitBLEManager::idleTick()
 {
-    if((system_timer_current_time() - pairing_completed_at_time) >= MICROBIT_BLE_DISCONNECT_AFTER_PAIRING_DELAY) {
-        if (ble)
-            ble->disconnect(pairingHandle, Gap::REMOTE_DEV_TERMINATION_DUE_TO_POWER_OFF);
-        fiber_remove_idle_component(this);
-    }
 
-}
+}  
 
 
 /**
@@ -513,15 +255,10 @@
 #if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_URL)
 /**
   * Set the content of Eddystone URL frames
-  *
   * @param url The url to broadcast
-  *
   * @param calibratedPower the transmission range of the beacon (Defaults to: 0xF0 ~10m).
-  *
   * @param connectable true to keep bluetooth connectable for other services, false otherwise. (Defaults to true)
-  *
   * @param interval the rate at which the micro:bit will advertise url frames. (Defaults to MICROBIT_BLE_EDDYSTONE_ADV_INTERVAL)
-  *
   * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
   * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
   */
@@ -547,15 +284,10 @@
 
 /**
   * Set the content of Eddystone URL frames, but accepts a ManagedString as a url.
-  *
   * @param url The url to broadcast
-  *
   * @param calibratedPower the transmission range of the beacon (Defaults to: 0xF0 ~10m).
-  *
   * @param connectable true to keep bluetooth connectable for other services, false otherwise. (Defaults to true)
-  *
   * @param interval the rate at which the micro:bit will advertise url frames. (Defaults to MICROBIT_BLE_EDDYSTONE_ADV_INTERVAL)
-  *
   * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
   * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
   */
@@ -565,206 +297,11 @@
 }
 #endif
 
-#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_UID)
-/**
-  * Set the content of Eddystone UID frames
-  *
-  * @param uid_namespace: the uid namespace. Must 10 bytes long.
-  *
-  * @param uid_instance:  the uid instance value. Must 6 bytes long.
-  *
-  * @param calibratedPower the transmission range of the beacon (Defaults to: 0xF0 ~10m).
-  *
-  * @param connectable true to keep bluetooth connectable for other services, false otherwise. (Defaults to true)
-  *
-  * @param interval the rate at which the micro:bit will advertise url frames. (Defaults to MICROBIT_BLE_EDDYSTONE_ADV_INTERVAL)
-  *
-  * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
-  * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
-  */
-int MicroBitBLEManager::advertiseEddystoneUid(const char* uid_namespace, const char* uid_instance, int8_t calibratedPower, bool connectable, uint16_t interval)
-{
-    ble->gap().stopAdvertising();
-    ble->clearAdvertisingPayload();
 
-    ble->setAdvertisingType(connectable ? GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED : GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED);
-    ble->setAdvertisingInterval(interval);
-
-    ble->accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
-
-    int ret = MicroBitEddystone::getInstance()->setUID(ble, uid_namespace, uid_instance, calibratedPower);
-
-#if (MICROBIT_BLE_ADVERTISING_TIMEOUT > 0)
-    ble->gap().setAdvertisingTimeout(MICROBIT_BLE_ADVERTISING_TIMEOUT);
-#endif
-    ble->gap().startAdvertising();
-
-    return ret;
-}
-#endif
-
-/**
- * Enter pairing mode. This is mode is called to initiate pairing, and to enable FOTA programming
- * of the micro:bit in cases where BLE is disabled during normal operation.
- *
- * @param display An instance of MicroBitDisplay used when displaying pairing information.
- * @param authorizationButton The button to use to authorise a pairing request.
- *
- * @code
- * // initiate pairing mode
- * bleManager.pairingMode(uBit.display, uBit.buttonA);
- * @endcode
- */
-void MicroBitBLEManager::pairingMode(MicroBitDisplay &display, MicroBitButton &authorisationButton)
-{
-    ManagedString namePrefix("BBC micro:bit [");
-    ManagedString namePostfix("]");
-    ManagedString BLEName = namePrefix + deviceName + namePostfix;
-
-    ManagedString msg("PAIRING MODE!");
-
-    int timeInPairingMode = 0;
-    int brightness = 255;
-    int fadeDirection = 0;
-
-    ble->gap().stopAdvertising();
-
-// Clear the whitelist (if we have one), so that we're discoverable by all BLE devices.
-#if CONFIG_ENABLED(MICROBIT_BLE_WHITELIST)
-    BLEProtocol::Address_t addresses[MICROBIT_BLE_MAXIMUM_BONDS];
-    Gap::Whitelist_t whitelist;
-    whitelist.addresses = addresses;
-    whitelist.capacity = MICROBIT_BLE_MAXIMUM_BONDS;
-    whitelist.size = 0;
-    ble->gap().setWhitelist(whitelist);
-    ble->gap().setAdvertisingPolicyMode(Gap::ADV_POLICY_IGNORE_WHITELIST);
-#endif
-
-    // Update the advertised name of this micro:bit to include the device name
-    ble->clearAdvertisingPayload();
-
-    ble->accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
-    ble->accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)BLEName.toCharArray(), BLEName.length());
-    ble->setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
-    ble->setAdvertisingInterval(200);
-
-    ble->gap().setAdvertisingTimeout(0);
-    ble->gap().startAdvertising();
-
-    // Stop any running animations on the display
-    display.stopAnimation();
-    display.scroll(msg);
-
-    // Display our name, visualised as a histogram in the display to aid identification.
-    showNameHistogram(display);
-
-    while (1)
-    {
-        if (pairingStatus & MICROBIT_BLE_PAIR_REQUEST)
-        {
-            timeInPairingMode = 0;
-            MicroBitImage arrow("0,0,255,0,0\n0,255,0,0,0\n255,255,255,255,255\n0,255,0,0,0\n0,0,255,0,0\n");
-            display.print(arrow, 0, 0, 0);
+ void MicroBitBLEManager::pairingMode(MicroBitDisplay &display, MicroBitButton &authorisationButton)
+ {
 
-            if (fadeDirection == 0)
-                brightness -= MICROBIT_PAIRING_FADE_SPEED;
-            else
-                brightness += MICROBIT_PAIRING_FADE_SPEED;
-
-            if (brightness <= 40)
-                display.clear();
-
-            if (brightness <= 0)
-                fadeDirection = 1;
-
-            if (brightness >= 255)
-                fadeDirection = 0;
-
-            if (authorisationButton.isPressed())
-            {
-                pairingStatus &= ~MICROBIT_BLE_PAIR_REQUEST;
-                pairingStatus |= MICROBIT_BLE_PAIR_PASSCODE;
-            }
-        }
-
-        if (pairingStatus & MICROBIT_BLE_PAIR_PASSCODE)
-        {
-            timeInPairingMode = 0;
-            display.setBrightness(255);
-            for (int i = 0; i < passKey.length(); i++)
-            {
-                display.image.print(passKey.charAt(i), 0, 0);
-                fiber_sleep(800);
-                display.clear();
-                fiber_sleep(200);
-
-                if (pairingStatus & MICROBIT_BLE_PAIR_COMPLETE)
-                    break;
-            }
-
-            fiber_sleep(1000);
-        }
-
-        if (pairingStatus & MICROBIT_BLE_PAIR_COMPLETE)
-        {
-            if (pairingStatus & MICROBIT_BLE_PAIR_SUCCESSFUL)
-            {
-                MicroBitImage tick("0,0,0,0,0\n0,0,0,0,255\n0,0,0,255,0\n255,0,255,0,0\n0,255,0,0,0\n");
-                display.print(tick, 0, 0, 0);
-                fiber_sleep(15000);
-                timeInPairingMode = MICROBIT_BLE_PAIRING_TIMEOUT * 30;
+ 
+}  
 
-                /*
-                 * Disabled, as the API to return the number of active bonds is not reliable at present...
-                 *
-                display.clear();
-                ManagedString c(getBondCount());
-                ManagedString c2("/");
-                ManagedString c3(MICROBIT_BLE_MAXIMUM_BONDS);
-                ManagedString c4("USED");
 
-                display.scroll(c+c2+c3+c4);
-                *
-                *
-                */
-            }
-            else
-            {
-                MicroBitImage cross("255,0,0,0,255\n0,255,0,255,0\n0,0,255,0,0\n0,255,0,255,0\n255,0,0,0,255\n");
-                display.print(cross, 0, 0, 0);
-            }
-        }
-
-        fiber_sleep(100);
-        timeInPairingMode++;
-
-        if (timeInPairingMode >= MICROBIT_BLE_PAIRING_TIMEOUT * 30)
-            microbit_reset();
-    }
-}
-
-/**
- * Displays the device's ID code as a histogram on the provided MicroBitDisplay instance.
- *
- * @param display The display instance used for displaying the histogram.
- */
-void MicroBitBLEManager::showNameHistogram(MicroBitDisplay &display)
-{
-    uint32_t n = NRF_FICR->DEVICEID[1];
-    int ld = 1;
-    int d = MICROBIT_DFU_HISTOGRAM_HEIGHT;
-    int h;
-
-    display.clear();
-    for (int i = 0; i < MICROBIT_DFU_HISTOGRAM_WIDTH; i++)
-    {
-        h = (n % d) / ld;
-
-        n -= h;
-        d *= MICROBIT_DFU_HISTOGRAM_HEIGHT;
-        ld *= MICROBIT_DFU_HISTOGRAM_HEIGHT;
-
-        for (int j = 0; j < h + 1; j++)
-            display.image.setPixelValue(MICROBIT_DFU_HISTOGRAM_WIDTH - i - 1, MICROBIT_DFU_HISTOGRAM_HEIGHT - j - 1, 255);
-    }
-}

--- a/source/bluetooth/MicroBitEddystone.cpp	Wed Feb 08 07:49:17 2017 +0000
+++ b/source/bluetooth/MicroBitEddystone.cpp	Mon Jul 17 20:49:56 2017 +0000
@@ -57,11 +57,7 @@
 const uint8_t EDDYSTONE_URL_FRAME_TYPE = 0x10;
 #endif
 
-#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_UID)
-const int EDDYSTONE_UID_NAMESPACE_MAX_LENGTH = 10;
-const int EDDYSTONE_UID_INSTANCE_MAX_LENGTH = 6;
-const uint8_t EDDYSTONE_UID_FRAME_TYPE = 0x00;
-#endif
+
 
 /**
  * Constructor.
@@ -89,11 +85,8 @@
 
 /**
   * Set the content of Eddystone URL frames
-  *
   * @param url The url to broadcast
-  *
   * @param calibratedPower the transmission range of the beacon (Defaults to: 0xF0 ~10m).
-  *
   * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
   * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
   */
@@ -157,11 +150,8 @@
 
 /**
   * Set the content of Eddystone URL frames, but accepts a ManagedString as a url.
-  *
   * @param url The url to broadcast
-  *
   * @param calibratedPower the transmission range of the beacon (Defaults to: 0xF0 ~10m).
-  *
   * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
   * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
   */
@@ -171,45 +161,3 @@
 }
 #endif
 
-#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_UID)
-
-/**
-  * Set the content of Eddystone UID frames
-  *
-  * @param uid_namespace the uid namespace. Must 10 bytes long.
-  *
-  * @param uid_instance  the uid instance value. Must 6 bytes long.
-  *
-  * @param calibratedPower the transmission range of the beacon (Defaults to: 0xF0 ~10m).
-  *
-  * @note The calibratedPower value ranges from -100 to +20 to a resolution of 1. The calibrated power should be binary encoded.
-  * More information can be found at https://github.com/google/eddystone/tree/master/eddystone-uid#tx-power
-  */
-int MicroBitEddystone::setUID(BLEDevice* ble, const char* uid_namespace, const char* uid_instance, int8_t calibratedPower)
-{
-    if (uid_namespace == NULL || uid_instance == NULL)
-        return MICROBIT_INVALID_PARAMETER;
-
-    char uidData[EDDYSTONE_UID_NAMESPACE_MAX_LENGTH + EDDYSTONE_UID_INSTANCE_MAX_LENGTH];
-
-    // UID namespace
-    memcpy(uidData, uid_namespace, EDDYSTONE_UID_NAMESPACE_MAX_LENGTH);
-
-    // UID instance
-    memcpy(uidData + EDDYSTONE_UID_NAMESPACE_MAX_LENGTH, uid_instance, EDDYSTONE_UID_INSTANCE_MAX_LENGTH);
-
-    uint8_t rawFrame[EDDYSTONE_UID_NAMESPACE_MAX_LENGTH + EDDYSTONE_UID_INSTANCE_MAX_LENGTH + 4];
-    size_t index = 0;
-    rawFrame[index++] = EDDYSTONE_UUID[0];
-    rawFrame[index++] = EDDYSTONE_UUID[1];
-    rawFrame[index++] = EDDYSTONE_UID_FRAME_TYPE;
-    rawFrame[index++] = calibratedPower;
-    memcpy(rawFrame + index, uidData, EDDYSTONE_UID_NAMESPACE_MAX_LENGTH + EDDYSTONE_UID_INSTANCE_MAX_LENGTH);
-
-    ble->accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS, EDDYSTONE_UUID, sizeof(EDDYSTONE_UUID));
-    ble->accumulateAdvertisingPayload(GapAdvertisingData::SERVICE_DATA, rawFrame, index + EDDYSTONE_UID_NAMESPACE_MAX_LENGTH + EDDYSTONE_UID_INSTANCE_MAX_LENGTH);
-
-    return MICROBIT_OK;
-}
-
-#endif