Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Merge pull request #2382 from mikeller/make_flash_erasing_compile_conditional

Browse source 
Made flash erasing compile conditional on USE_FLASHFS.
This commit is contained in:
Martin Budden 2017-02-21 09:18:02 +00:00 • committed by GitHub
commit 5e7a755be3
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1476,9 +1476,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()) {
@ -1603,6 +1605,7 @@ void handleBlackbox(timeUs_t currentTimeUs)
blackboxSetState(BLACKBOX_STATE_STOPPED);
}
break;
#ifdef USE_FLASHFS
case BLACKBOX_STATE_START_ERASE:
blackboxEraseAll();
blackboxSetState(BLACKBOX_STATE_ERASING);
@ -1610,7 +1613,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);
}
@ -1620,21 +1623,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()) {