From 15bef42fd2934fd464eb65ee73637f16230152ab Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Mon, 13 Feb 2017 00:25:42 +1300
Subject: [PATCH] Made flash erasing compile conditional on USE_FLASHFS.

---
 src/main/blackbox/blackbox.c    | 11 +++++++++--
 src/main/blackbox/blackbox_io.c |  6 ++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index 2f77ad5f9..1e36674af 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -1475,9 +1475,11 @@ void handleBlackbox(timeUs_t currentTimeUs)
                 blackboxOpen();  
                 startBlackbox();
             }
+#ifdef USE_FLASHFS
             if (IS_RC_MODE_ACTIVE(BOXBLACKBOXERASE)) {
                 blackboxSetState(BLACKBOX_STATE_START_ERASE);
             }
+#endif
         break;
         case BLACKBOX_STATE_PREPARE_LOG_FILE:
             if (blackboxDeviceBeginLog()) {
@@ -1602,6 +1604,7 @@ void handleBlackbox(timeUs_t currentTimeUs)
                 blackboxSetState(BLACKBOX_STATE_STOPPED);
             }
         break;
+#ifdef USE_FLASHFS
         case BLACKBOX_STATE_START_ERASE:
 	        blackboxEraseAll();
 	        blackboxSetState(BLACKBOX_STATE_ERASING);
@@ -1609,7 +1612,7 @@ void handleBlackbox(timeUs_t currentTimeUs)
         break;
         case BLACKBOX_STATE_ERASING:
 	        if (isBlackboxErased()) {
-                //Done eraseing
+                //Done erasing
                 blackboxSetState(BLACKBOX_STATE_ERASED);
                 beeper(BEEPER_BLACKBOX_ERASE);
             }
@@ -1619,21 +1622,25 @@ void handleBlackbox(timeUs_t currentTimeUs)
                 blackboxSetState(BLACKBOX_STATE_STOPPED);
             }
         break;
+#endif
         default:
         break;
     }
 
     // Did we run out of room on the device? Stop!
     if (isBlackboxDeviceFull()) {
+#ifdef USE_FLASHFS
         if (blackboxState != BLACKBOX_STATE_ERASING 
             && blackboxState != BLACKBOX_STATE_START_ERASE
             && blackboxState != BLACKBOX_STATE_ERASED) {
+#endif
             blackboxSetState(BLACKBOX_STATE_STOPPED);
             // ensure we reset the test mode flag if we stop due to full memory card
             if (startedLoggingInTestMode) startedLoggingInTestMode = false;
+#ifdef USE_FLASHFS
         }
+#endif
     } else { // Only log in test mode if there is room!
-
         if(blackboxConfig()->on_motor_test) {
             // Handle Motor Test Mode
             if(inMotorTestMode()) {
diff --git a/src/main/blackbox/blackbox_io.c b/src/main/blackbox/blackbox_io.c
index 57852f2d1..ca055f81b 100644
--- a/src/main/blackbox/blackbox_io.c
+++ b/src/main/blackbox/blackbox_io.c
@@ -614,14 +614,13 @@ bool blackboxDeviceOpen(void)
 /**
  * Erase all blackbox logs
  */
+#ifdef USE_FLASHFS
 void blackboxEraseAll(void)
 {
     switch (blackboxConfig()->device) {
-#ifdef USE_FLASHFS
     case BLACKBOX_DEVICE_FLASH:
         flashfsEraseCompletely();
         break;
-#endif
     default:
         //not supported
         break;
@@ -635,11 +634,9 @@ void blackboxEraseAll(void)
 bool isBlackboxErased(void)
 {
     switch (blackboxConfig()->device) {
-#ifdef USE_FLASHFS
     case BLACKBOX_DEVICE_FLASH:
         return flashfsIsReady();
         break;
-#endif
     default:
     //not supported
         return true;
@@ -647,6 +644,7 @@ bool isBlackboxErased(void)
 
     }
 }
+#endif
 
 /**
  * Close the Blackbox logging device immediately without attempting to flush any remaining data.