rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made flash erasing compile conditional on USE_FLASHFS.

This commit is contained in:
mikeller 2017-02-13 00:25:42 +13:00 committed by Michael Keller
parent cb2356ba76
commit 15bef42fd2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/blackbox/blackbox.c
View File

@ -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()) {

6
src/main/blackbox/blackbox_io.c
View File

@ -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.