Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Macro renamed for #3675

Browse source
This commit is contained in:
Bertrand Songis 2016-08-01 20:37:04 +02:00
parent ea095b2447
commit 9f37e7a0fb
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/telemetry/frsky.h
View file

@ -273,9 +273,9 @@ PACK(struct FrskyTelemetryData {
#endif #endif
#if defined(PCBX9DP) || defined(PCBX9E) #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 #else
#define IS_VALID_XJT_VERSION() (1) #define IS_SWR_VALUE_VALID() (true)
#endif #endif
#define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == SWR_ID)) #define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == SWR_ID))

6
radio/src/telemetry/telemetry.cpp
View file

@ -141,11 +141,7 @@ void telemetryWakeup()
} }
#endif #endif
#if defined(PCBX9DP) || defined(PCBX9E) #define FRSKY_BAD_ANTENNA() (IS_SWR_VALUE_VALID() && telemetryData.swr.value > 0x33)
#define FRSKY_BAD_ANTENNA() (IS_VALID_XJT_VERSION() && telemetryData.swr.value > 0x33)
#else
#define FRSKY_BAD_ANTENNA() (telemetryData.swr.value > 0x33)
#endif
#if defined(CPUARM) #if defined(CPUARM)
static tmr10ms_t alarmsCheckTime = 0; static tmr10ms_t alarmsCheckTime = 0;