Compilation options updated

This commit is contained in:
Bertrand Songis
2019-05-15 16:13:10 +02:00
parent 4bdd76a214
commit ccaf77f753
2 changed files with 15 additions and 9 deletions
@@ -1139,14 +1139,17 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware)
addOpenTxRfOptions(firmware); addOpenTxRfOptions(firmware);
} }
void addOpenTxTaranisOptions(OpenTxFirmware * firmware, bool intppm = true) void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
{ {
addOpenTxFrskyOptions(firmware); addOpenTxFrskyOptions(firmware);
if (intppm)
firmware->addOption("internalppm", Firmware::tr("Support for PPM internal module hack"));
addOpenTxFontOptions(firmware); addOpenTxFontOptions(firmware);
} }
void addPPMInternalModuleHack(OpenTxFirmware * firmware)
{
firmware->addOption("internalppm", Firmware::tr("Support for PPM internal module hack"));
}
void addOpenTxArm9xOptions(OpenTxFirmware * firmware, bool dblkeys = true) void addOpenTxArm9xOptions(OpenTxFirmware * firmware, bool dblkeys = true)
{ {
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
@@ -1173,12 +1176,14 @@ void registerOpenTxFirmwares()
firmware = new OpenTxFirmware("opentx-x9d+", Firmware::tr("FrSky Taranis X9D+"), BOARD_TARANIS_X9DP); firmware = new OpenTxFirmware("opentx-x9d+", Firmware::tr("FrSky Taranis X9D+"), BOARD_TARANIS_X9DP);
firmware->addOption("noras", Firmware::tr("Disable RAS (SWR)")); firmware->addOption("noras", Firmware::tr("Disable RAS (SWR)"));
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
addPPMInternalModuleHack(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky Taranis X9D board */ /* FrSky Taranis X9D board */
firmware = new OpenTxFirmware("opentx-x9d", Firmware::tr("FrSky Taranis X9D"), BOARD_TARANIS_X9D); firmware = new OpenTxFirmware("opentx-x9d", Firmware::tr("FrSky Taranis X9D"), BOARD_TARANIS_X9D);
firmware->addOption("haptic", Firmware::tr("Haptic module installed")); firmware->addOption("haptic", Firmware::tr("Haptic module installed"));
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
addPPMInternalModuleHack(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky Taranis X9E board */ /* FrSky Taranis X9E board */
@@ -1186,28 +1191,29 @@ void registerOpenTxFirmwares()
firmware->addOption("shutdownconfirm", Firmware::tr("Confirmation before radio shutdown")); firmware->addOption("shutdownconfirm", Firmware::tr("Confirmation before radio shutdown"));
firmware->addOption("horussticks", Firmware::tr("Horus gimbals installed (Hall sensors)")); firmware->addOption("horussticks", Firmware::tr("Horus gimbals installed (Hall sensors)"));
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
addPPMInternalModuleHack(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X9-Lite board */ /* FrSky X9-Lite board */
firmware = new OpenTxFirmware("opentx-x9lite", Firmware::tr("FrSky Taranis X9-Lite"), BOARD_TARANIS_X9LITE); firmware = new OpenTxFirmware("opentx-x9lite", Firmware::tr("FrSky Taranis X9-Lite"), BOARD_TARANIS_X9LITE);
addOpenTxTaranisOptions(firmware, false); addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X7 board */ /* FrSky X7 board */
firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7); firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
addOpenTxTaranisOptions(firmware, false); addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X-Lite S/PRO board */ /* FrSky X-Lite S/PRO board */
firmware = new OpenTxFirmware("opentx-xlites", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES); firmware = new OpenTxFirmware("opentx-xlites", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES);
// firmware->addOption("stdr9m", QCoreApplication::translate("Firmware", "Use JR-sized R9M module"));
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
firmware->addOption("internalpxx1", Firmware::tr("Support for PXX1 internal module replacement"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X-Lite board */ /* FrSky X-Lite board */
firmware = new OpenTxFirmware("opentx-xlite", Firmware::tr("FrSky Taranis X-Lite"), BOARD_TARANIS_XLITE); firmware = new OpenTxFirmware("opentx-xlite", Firmware::tr("FrSky Taranis X-Lite"), BOARD_TARANIS_XLITE);
// firmware->addOption("stdr9m", Firmware::tr("Use JR-sized R9M module")); // firmware->addOption("stdr9m", Firmware::tr("Use JR-sized R9M module"));
addOpenTxTaranisOptions(firmware, false); addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X10 board */ /* FrSky X10 board */
+2 -2
View File
@@ -1,7 +1,7 @@
option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF) option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF) option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
option(INTERNAL_MODULE_PPM "Taranis internal module hack to output PPM" OFF) option(INTERNAL_MODULE_PPM "Support for PPM internal module hack" OFF)
option(INTERNAL_MODULE_PXX1 "Taranis internal module hack to output PXX1" OFF) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module replacement" OFF)
option(USEHORUSBT "X9E BT module replaced by Horus BT module" OFF) option(USEHORUSBT "X9E BT module replaced by Horus BT module" OFF)
option(PXX1 "PXX1 protocol support" ON) option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" ON) option(PXX2 "PXX2 protocol support" ON)