Cristiano Barbosa / microbit-dal2

security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Files at this revision

API Documentation at this revision

Revision 74:8cb1c4aa4527, committed 2018-01-26

Comitter:
cristianobarbosa
Date:
Fri Jan 26 14:11:55 2018 +0000
Parent:
73:eb91bba49623
Commit message:
sender

Changed in this revision

source/bluetooth/MicroBitDFUService.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/bluetooth/MicroBitDFUService.cpp	Wed Jul 13 14:32:54 2016 +0000
+++ b/source/bluetooth/MicroBitDFUService.cpp	Fri Jan 26 14:11:55 2018 +0000
@@ -76,7 +76,7 @@
     controlByte = 0x00;
 
     // Set default security requirements
-    microBitDFUServiceControlCharacteristic.requireSecurity(SecurityManager::MICROBIT_BLE_SECURITY_LEVEL);
+    //microBitDFUServiceControlCharacteristic.requireSecurity(SecurityManager::MICROBIT_BLE_SECURITY_LEVEL);
 
     GattCharacteristic *characteristics[] = {&microBitDFUServiceControlCharacteristic};
     GattService         service(MicroBitDFUServiceUUID, characteristics, sizeof(characteristics) / sizeof(GattCharacteristic *));
@@ -102,9 +102,9 @@
             //uBit.display.stopAnimation();
             //uBit.display.clear();
 
-#if CONFIG_ENABLED(MICROBIT_DBG)
+//#if CONFIG_ENABLED(MICROBIT_DBG)
             printf("  ACTIVATING BOOTLOADER.\n");
-#endif
+//#endif
 
             // Perform an explicit disconnection to assist our peer to reconnect to the DFU service
             ble.disconnect(Gap::REMOTE_DEV_TERMINATION_DUE_TO_POWER_OFF);