From 8ce51e42397add4725b1b29f02c0f4930aa78fc4 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 27 Mar 2020 12:38:10 +0100 Subject: [PATCH] RAS fix (#7463) --- companion/src/firmwares/opentx/opentxinterface.cpp | 1 + radio/src/telemetry/frsky.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 85d235679..eb3750447 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1252,6 +1252,7 @@ void registerOpenTxFirmwares() /* FrSky Taranis X9D board */ firmware = new OpenTxFirmware("opentx-x9d", Firmware::tr("FrSky Taranis X9D"), BOARD_TARANIS_X9D); + firmware->addOption("noras", Firmware::tr("Disable RAS (SWR)")); firmware->addOption("haptic", Firmware::tr("Haptic module installed")); addOpenTxTaranisOptions(firmware); addPPMInternalModuleHack(firmware); diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index 8218447e4..763da1b32 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -293,10 +293,10 @@ inline bool isRasValueValid() { return true; } -#elif defined(PCBX9DP) || defined(PCBX9E) +#elif defined(PCBTARANIS) inline bool isRasValueValid() { - return telemetryData.xjtVersion != 0x0000 && telemetryData.xjtVersion != 0x00FF; + return telemetryData.xjtVersion != 0x00FF; } #elif defined(PCBHORUS) inline bool isRasValueValid()