From 6c5d53194a6e9568fc7d8fa3f5ab758ee6abb4dc Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 15 Sep 2014 12:30:37 +0200 Subject: [PATCH] S.PORT logs traced in sport.log when SPORT_FILE_LOG=YES taken from #1644 --- radio/src/Makefile | 11 +++++++++++ radio/src/targets/taranis/diskio.cpp | 9 +++++---- radio/src/telemetry/frsky.cpp | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/radio/src/Makefile b/radio/src/Makefile index e37bb0eca..677365c4a 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -252,6 +252,10 @@ EEPROM_PROGRESS_BAR = NO # Values = YES, NO DEBUG = NO +# Activate writing of SPORT telemetry received data to sport.log file +# Values = YES, NO +SPORT_FILE_LOG = NO + # Flight Modes # Values = YES, NO FLIGHT_MODES = YES @@ -605,6 +609,9 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) CPPDEFS += -DROTARY_ENCODERS=1 CPPSRC += targets/sky9x/rotenc_driver.cpp endif + ifeq ($(SPORT_FILE_LOG), YES) + CPPDEFS += -DSPORT_FILE_LOG + endif INCDIRS += targets/sky9x CoOS/kernel CoOS/portable BOARDSRC = targets/sky9x/board_sky9x.cpp EXTRABOARDSRC = targets/sky9x/lcd_driver.cpp @@ -661,6 +668,10 @@ ifeq ($(PCB), TARANIS) else CPPDEFS = -DREV4 endif + ifeq ($(SPORT_FILE_LOG), YES) + DEBUG = YES + CPPDEFS += -DSPORT_FILE_LOG + endif LDSCRIPT = targets/taranis/stm32_flash_bl.ld TRGT = arm-none-eabi- MCU = cortex-m3 diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp index c16ecc8d7..b967537c3 100644 --- a/radio/src/targets/taranis/diskio.cpp +++ b/radio/src/targets/taranis/diskio.cpp @@ -973,7 +973,7 @@ void sdPoll10ms() // TODO everything here should not be in the driver layer ... FATFS g_FATFS_Obj; -#if defined(DEBUG) +#if defined(SPORT_FILE_LOG) FIL g_telemetryFile = {0}; #endif @@ -991,10 +991,11 @@ void sdInit(void) if (f_mount(0, &g_FATFS_Obj) == FR_OK) { referenceSystemAudioFiles(); -#if defined(DEBUG) +#if defined(SPORT_FILE_LOG) f_open(&g_telemetryFile, LOGS_PATH "/sport.log", FA_OPEN_ALWAYS | FA_WRITE); - if (f_size(&g_telemetryFile) > 0) + if (f_size(&g_telemetryFile) > 0) { f_lseek(&g_telemetryFile, f_size(&g_telemetryFile)); // append + } #endif } } @@ -1003,7 +1004,7 @@ void sdDone() { if (sdMounted()) { audioQueue.stopSD(); -#if defined(DEBUG) +#if defined(SPORT_FILE_LOG) f_close(&g_telemetryFile); #endif f_mount(0, 0); // unmount SD diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index c7539118d..340548b45 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -294,7 +294,7 @@ void telemetryWakeup() #endif while (telemetryFifo.pop(data)) { processSerialData(data); -#if defined(DEBUG) && !defined(SIMU) +#if defined(SPORT_FILE_LOG) && !defined(SIMU) extern FIL g_telemetryFile; if (lastTime != newTime) { f_printf(&g_telemetryFile, "\r\n%4d-%02d-%02d,%02d:%02d:%02d.%02d0: %02X", utm.tm_year+1900, utm.tm_mon+1, utm.tm_mday, utm.tm_hour, utm.tm_min, utm.tm_sec, g_ms100, data);