Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 02:38:07 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

[sdlog] don't open log nor monitor battery if init fails

Browse Source 
this protect when starting a log without SD card...
This commit is contained in:
Gautier Hattenberger
2016-06-24 17:52:02 +02:00
parent 9777a2d0b5
commit b534741300
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/modules/loggers/sdlog_chibios.c
+16 -18
View File
@@ -159,23 +159,27 @@ static void thd_startlog(void *arg)
// Check for init errors
sdOk = true;
if (sdLogInit (NULL) != SDLOG_OK)
sdOk = false;
removeEmptyLogs (PPRZ_LOG_DIR, PPRZ_LOG_NAME, 50);
if (sdLogOpenLog (&pprzLogFile, PPRZ_LOG_DIR, PPRZ_LOG_NAME, true) != SDLOG_OK)
if (sdLogInit (NULL) != SDLOG_OK) {
sdOk = false;
}
else {
removeEmptyLogs (PPRZ_LOG_DIR, PPRZ_LOG_NAME, 50);
if (sdLogOpenLog (&pprzLogFile, PPRZ_LOG_DIR, PPRZ_LOG_NAME, true) != SDLOG_OK)
sdOk = false;
#if FLIGHTRECORDER_SDLOG
removeEmptyLogs (FR_LOG_DIR, FLIGHTRECORDER_LOG_NAME, 50);
if (sdLogOpenLog (&flightRecorderLogFile, FR_LOG_DIR, FLIGHTRECORDER_LOG_NAME, false) != SDLOG_OK)
sdOk = false;
removeEmptyLogs (FR_LOG_DIR, FLIGHTRECORDER_LOG_NAME, 50);
if (sdLogOpenLog (&flightRecorderLogFile, FR_LOG_DIR, FLIGHTRECORDER_LOG_NAME, false) != SDLOG_OK)
sdOk = false;
#endif
}
// Create Battery Survey Thread with event
chEvtObjectInit (&powerOutageSource);
chThdCreateStatic (wa_thd_bat_survey, sizeof(wa_thd_bat_survey),
NORMALPRIO+2, thd_bat_survey, NULL);
if (sdOk) {
// Create Battery Survey Thread with event
chEvtObjectInit (&powerOutageSource);
chThdCreateStatic (wa_thd_bat_survey, sizeof(wa_thd_bat_survey),
NORMALPRIO+2, thd_bat_survey, NULL);
}
while (true) {
#ifdef LED_SDLOG
@@ -185,12 +189,6 @@ static void thd_startlog(void *arg)
chThdSleepMilliseconds (sdOk == true ? 1000 : 200);
static uint32_t timestamp = 0;
// FIXME what is this doing ? -> ask Alex
thread_t *tp = chRegFirstThread();
do {
tp = chRegNextThread(tp);
} while (tp != NULL);
#if HAL_USE_RTC
// FIXME this could be done somewhere else, like in sys_time
// we sync gps time to rtc every 5 seconds