From cbf596e4107aefc07d68725a249346667bc746d1 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 3 Mar 2018 08:50:09 +0100 Subject: [PATCH] Remove internalppm from x7 options since it was never coded into 128 gui --- companion/src/firmwares/opentx/opentxinterface.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 966e8bd8f..0a9fd61f6 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -882,7 +882,7 @@ EepromLoadErrors OpenTxEepromInterface::checkVersion(unsigned int version) // A lot of things (first github release) if (IS_2560(board) || IS_M128(board)) { return OLD_VERSION; - } + } case 217: // 3 logical switches removed on M128 / gruvin9x boards if (IS_ARM(board)) { @@ -1103,7 +1103,6 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware) void addOpenTxTaranisOptions(OpenTxFirmware * firmware) { addOpenTxFrskyOptions(firmware); - firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font")); firmware->addOption("noras", QCoreApplication::translate("Firmware", "Disable RAS (SWR)")); } @@ -1168,12 +1167,14 @@ void registerOpenTxFirmwares() /* FrSky Taranis X9D+ board */ firmware = new OpenTxFirmware("opentx-x9d+", QCoreApplication::translate("Firmware", "FrSky Taranis X9D+"), BOARD_TARANIS_X9DP); + firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack")); addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware); /* FrSky Taranis X9D board */ firmware = new OpenTxFirmware("opentx-x9d", QCoreApplication::translate("Firmware", "FrSky Taranis X9D"), BOARD_TARANIS_X9D); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Haptic module installed")); + firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack")); addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware); @@ -1181,6 +1182,7 @@ void registerOpenTxFirmwares() firmware = new OpenTxFirmware("opentx-x9e", QCoreApplication::translate("Firmware", "FrSky Taranis X9E"), BOARD_TARANIS_X9E); firmware->addOption("shutdownconfirm", QCoreApplication::translate("Firmware", "Confirmation before radio shutdown")); firmware->addOption("horussticks", QCoreApplication::translate("Firmware", "Horus gimbals installed (Hall sensors)")); + firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack")); addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware);