Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HAL_F4Light: abort logging in case of filesystem errors

This commit is contained in:
night-ghost 2018-05-04 15:19:35 +05:00 committed by Andrew Tridgell
parent 4e452c77f8
commit ecafe263a6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/DataFlash/DataFlash_File_sd.cpp
View File

@ -805,7 +805,13 @@ uint16_t DataFlash_File::start_new_log(void)
// opening failed
printf("Log open fail for %s: %s\n",fname, SD.strError(SD.lastError));
free(fname);
if(SD.lastError == FR_DISK_ERR) {
_initialised = false; // no space
_open_error = true; // don't try any more
printf("\nLoging aborted\n");
return 0xFFFF;
}
log_num++; // if not at end - try to open next log
if (log_num >= MAX_LOG_FILES) {
@ -912,6 +918,13 @@ void DataFlash_File::_io_timer(void)
}
}
} else
#else
if(FR_INT_ERR == err || FR_NO_FILESYSTEM == err || FR_INVALID_OBJECT == err) { // internal error - bad filesystem
gcs().send_text(MAV_SEVERITY_INFO, "logging cancelled");
_initialised = false;
_open_error = true;
} else
#endif
{
_busy = true; // Prep_MinSpace requires a long time and 1s task will kill process