diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index 4a173014b..9e0b51575 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -115,8 +115,8 @@ const pm_char * openLogs()
     f_puts("Time,", &g_oLogFile);
 #endif
 
-#if defined(FRSKY_SPORT)
-    f_puts("SWR,RSSI,A1,A2,", &g_oLogFile);
+#if defined(CPUARM)
+    f_puts("SWR,RSSI,A1,A2,A3,A4", &g_oLogFile);
 #elif defined(FRSKY)
     f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile);
 #endif
@@ -196,14 +196,14 @@ void writeLogs()
       f_printf(&g_oLogFile, "%d,", tmr10ms);
 #endif
 
-#if defined(FRSKY_SPORT)
-      f_printf(&g_oLogFile, "%d,%d,", frskyData.rssi[1].value, frskyData.rssi[0].value);
+#if defined(CPUARM)
+      f_printf(&g_oLogFile, "%d,%d,", frskyData.swr.value, frskyData.rssi[0].value);
 #elif defined(FRSKY)
       f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, frskyData.rssi[0].value, frskyData.rssi[1].value);
 #endif
 
 #if defined(FRSKY)
-      for (uint8_t i=0; i<2; i++) {
+      for (uint8_t i=0; i<MAX_FRSKY_A_CHANNELS; i++) {
         int16_t converted_value = applyChannelRatio(i, frskyData.analog[i].value);
         f_printf(&g_oLogFile, "%d.%02d,", converted_value/100, converted_value%100);
       }