From 9f37e7a0fb64ef64690e7d9c390b728eba67c06b Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 1 Aug 2016 20:37:04 +0200
Subject: [PATCH] Macro renamed for #3675

---
 radio/src/telemetry/frsky.h       | 4 ++--
 radio/src/telemetry/telemetry.cpp | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index a3be50cca..9e546e694 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -273,9 +273,9 @@ PACK(struct FrskyTelemetryData {
 #endif
 
 #if defined(PCBX9DP) || defined(PCBX9E)
-  #define IS_VALID_XJT_VERSION()      (telemetryData.xjtVersion != 0 && telemetryData.xjtVersion != 0xff)
+  #define IS_SWR_VALUE_VALID()         (telemetryData.xjtVersion != 0 && telemetryData.xjtVersion != 0xff)
 #else
-  #define IS_VALID_XJT_VERSION()      (1)
+  #define IS_SWR_VALUE_VALID()         (true)
 #endif
 
 #define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == SWR_ID))
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 9a7e08e52..23b00ead2 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -140,12 +140,8 @@ void telemetryWakeup()
     varioWakeup();
   }
 #endif
-
-#if defined(PCBX9DP) || defined(PCBX9E)
-  #define FRSKY_BAD_ANTENNA() (IS_VALID_XJT_VERSION() && telemetryData.swr.value > 0x33)
-#else
-  #define FRSKY_BAD_ANTENNA() (telemetryData.swr.value > 0x33)
-#endif
+  
+#define FRSKY_BAD_ANTENNA()            (IS_SWR_VALUE_VALID() && telemetryData.swr.value > 0x33)
 
 #if defined(CPUARM)
   static tmr10ms_t alarmsCheckTime = 0;