Schoumi
/
microbit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11 from microbit-sam/dal-integration-flag-fix 

BLEMode -> RebootMode
master
Joe Finney 2018-08-09 10:17:17 +01:00 committed by GitHub
parent 94a7310f3a b5500c8f91
commit b6ff466bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/MicroBit.cpp
View File

@ -133,13 +133,13 @@ void MicroBit::init()
#if CONFIG_ENABLED(MICROBIT_BLE_PAIRING_MODE)
int i=0;
// Test if we need to enter BLE pairing mode
// If a BLEMode Key has been set boot straight into BLE mode
KeyValuePair* BLEMode = storage.get("BLEMode");
// If a RebootMode Key has been set boot straight into BLE mode
KeyValuePair* RebootMode = storage.get("RebootMode");
KeyValuePair* flashIncomplete = storage.get("flashIncomplete");
sleep(100);
// Animation
uint8_t x = 0; uint8_t y = 0;
while ((buttonA.isPressed() && buttonB.isPressed() && i<25) || BLEMode != NULL || flashIncomplete != NULL)
while ((buttonA.isPressed() && buttonB.isPressed() && i<25) || RebootMode != NULL || flashIncomplete != NULL)
{
display.image.setPixelValue(x,y,255);
sleep(50);
@ -150,13 +150,13 @@ void MicroBit::init()
y++; x = 0;
}
if (i == 25 || BLEMode != NULL)
if (i == 25 || RebootMode != NULL)
{
// Remove KV if it exists
if(BLEMode != NULL){
storage.remove("BLEMode");
if(RebootMode != NULL){
storage.remove("RebootMode");
}
delete BLEMode;
delete RebootMode;
delete flashIncomplete;
#if CONFIG_ENABLED(MICROBIT_HEAP_ALLOCATOR) && CONFIG_ENABLED(MICROBIT_HEAP_REUSE_SD)