piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

SWR added in the firmware as an option (SWR=YES)

Browse Source
This commit is contained in:
bsongis
2014-10-19 22:53:43 +02:00
parent 2fd5140e46
commit 1dada04b66
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/logs.cpp
+9 -8
View File
@@ -115,13 +115,15 @@ const pm_char * openLogs()
f_puts("Time,", &g_oLogFile);
#endif
#if defined(PCBTARANIS) && defined(REVPLUS)
f_puts("RSSI,A1,A2,A3,A4,", &g_oLogFile);
#elif defined(CPUARM) && defined(FRSKY)
#if defined(FRSKY)
#if defined(CPUARM) && defined(SWR)
f_puts("SWR,RSSI,A1,A2,A3,A4,", &g_oLogFile);
#elif defined(FRSKY)
#elif defined(CPUARM)
f_puts("RSSI,A1,A2,A3,A4,", &g_oLogFile);
#else
f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile);
#endif
#endif
#if defined(FRSKY_HUB)
if (IS_USR_PROTO_FRSKY_HUB()) {
@@ -207,14 +209,13 @@ void writeLogs()
#endif // #if defined(RTCLOCK)
#if defined(FRSKY)
#if defined(PCBTARANIS) && defined(REVPLUS)
f_printf(&g_oLogFile, "%d,", RAW_FRSKY_MINMAX(frskyData.rssi[0]));
#elif defined(CPUARM)
#if defined(CPUARM) && defined(SWR)
f_printf(&g_oLogFile, "%d,%d,", RAW_FRSKY_MINMAX(frskyData.swr), RAW_FRSKY_MINMAX(frskyData.rssi[0]));
#elif defined(CPUARM)
f_printf(&g_oLogFile, "%d,", RAW_FRSKY_MINMAX(frskyData.rssi[0]));
#else
f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, RAW_FRSKY_MINMAX(frskyData.rssi[0]), RAW_FRSKY_MINMAX(frskyData.rssi[1]));
#endif
for (uint8_t i=0; i<MAX_FRSKY_A_CHANNELS; i++) {
int16_t converted_value = applyChannelRatio(i, RAW_FRSKY_MINMAX(frskyData.analog[i]));
f_printf(&g_oLogFile, "%d.%02d,", converted_value/100, converted_value%100);