Added radioActive check to flashPageErase

RFduino · RFduino · commit 00367770ba64 · 2016-06-27T11:58:57.000-06:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 CHANGELOG
 
+v 2.3.3
+  - Enable C++11 support (thanks focalintent)
+  - Fix Print::printf("%f") with correct digits (thanks ShenggaoZhu)
+  - Added radioActive check to flashPageErase
+
 v 2.3.2
   - Fixes required to support Arduino 1.6.6
   - Updated to the latest RFDLoaders
diff --git a/cores/arduino/Memory.c b/cores/arduino/Memory.c
@@ -48,6 +48,10 @@ int flashPageErase( uint8_t page )
   if (page <= PAGE_FROM_ADDRESS(&_etextrelocate))
     return 2;
 
+  // do not erase flash if the BLE radio is active
+  while (RFduinoBLE_radioActive)
+    ;
+
   // enable flash page erase
   NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Een << NVMC_CONFIG_WEN_Pos);
   while (NRF_NVMC->READY == NVMC_READY_READY_Busy)
@@ -79,7 +83,7 @@ int flashWrite( uint32_t *address, uint32_t value )
   if (page <= PAGE_FROM_ADDRESS(&_etextrelocate))
     return 2;
 
-  // do not write to flash in the BLE radio is active
+  // do not write to flash if the BLE radio is active
   while (RFduinoBLE_radioActive)
     ;
 
