diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index 0810a7fa0..9d418a4d7 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -196,17 +196,13 @@ void writeLogs()
 
 #if defined(FRSKY)
 #if defined(CPUARM)
-      f_printf(&g_oLogFile, "%d,%d,", frskyData.swr.raw, frskyData.rssi[0].raw);
+      f_printf(&g_oLogFile, "%d,%d,", RAW_FRSKY_MINMAX(frskyData.swr), RAW_FRSKY_MINMAX(frskyData.rssi[0]));
 #else
-      f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, frskyData.rssi[0].value, frskyData.rssi[1].value);
+      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++) {
-#if defined(CPUARM)
-        int16_t converted_value = applyChannelRatio(i, frskyData.analog[i].raw);
-#else
-        int16_t converted_value = applyChannelRatio(i, frskyData.analog[i].value);
-#endif
+        int16_t converted_value = applyChannelRatio(i, RAW_FRSKY_MINMAX(frskyData.analog[i]));
         f_printf(&g_oLogFile, "%d.%02d,", converted_value/100, converted_value%100);
       }
 #endif
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index 635a4e0a5..5e6f09d02 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -70,6 +70,7 @@ extern uint8_t telemetryState;
 #endif
 
 #if defined(CPUARM)
+#define RAW_FRSKY_MINMAX(v)   v.raw
 #define TELEMETRY_AVERAGE_COUNT 2     //we actually average two more readings!
 class FrskyValueWithMin {
   public:
@@ -80,6 +81,7 @@ class FrskyValueWithMin {
     void set(uint8_t value);
 };
 #else
+#define RAW_FRSKY_MINMAX(v)   v.value
 class FrskyValueWithMin {
   public:
     uint8_t value;
diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp
index 1cdb7211d..011f409ec 100644
--- a/radio/src/tests/frsky.cpp
+++ b/radio/src/tests/frsky.cpp
@@ -110,13 +110,16 @@ TEST(FrSky, FrskyValueWithMinAveraging)
   FrskyValueWithMin testVal;
   testVal.value = 0;  
   testVal.set(10);
+  EXPECT_EQ(RAW_FRSKY_MINMAX(testVal), 10);
   EXPECT_EQ(testVal.value, expected[testPos++]);
   for(int n=2; n<10; ++n) {
     testVal.set(n*10);
+    EXPECT_EQ(RAW_FRSKY_MINMAX(testVal), n*10);
     EXPECT_EQ(testVal.value, expected[testPos++]);
   }
   for(int n=2; n<10; ++n) {
     testVal.set(100);
+    EXPECT_EQ(RAW_FRSKY_MINMAX(testVal), 100);
     EXPECT_EQ(testVal.value, expected[testPos++]);
   }
 }