chore: fixup missed build options, use common build options file (#5334)
This commit is contained in:
@@ -306,6 +306,8 @@ elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPRO)
|
||||
set(FLAVOUR tpro)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPROV2)
|
||||
set(FLAVOUR tprov2)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPROS)
|
||||
set(FLAVOUR tpros)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T20)
|
||||
set(FLAVOUR t20)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T20V2)
|
||||
|
||||
@@ -1410,18 +1410,6 @@ void registerOpenTxFirmwares()
|
||||
registerOpenTxFirmware(firmware);
|
||||
addOpenTxRfOptions(firmware, FLEX);
|
||||
|
||||
/* Jumper T-Lite F4 board */
|
||||
/* No immediate plans for this to be needed now
|
||||
firmware = new OpenTxFirmware(FIRMWAREID("tlitef4"), QCoreApplication::translate("Firmware", "Jumper T-Lite (F4 MCU)"), BOARD_JUMPER_TLITE_F4, "tlitef4", "edgetx-tlite");
|
||||
addOpenTxCommonOptions(firmware);
|
||||
firmware->addOption("noheli", Firmware::tr("Disable HELI menu and cyclic mix support"));
|
||||
firmware->addOption("nogvars", Firmware::tr("Disable Global variables"));
|
||||
firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
|
||||
addOpenTxFontOptions(firmware);
|
||||
registerOpenTxFirmware(firmware);
|
||||
addOpenTxRfOptions(firmware, FLEX);
|
||||
*/
|
||||
|
||||
/* Jumper T-Pro board */
|
||||
firmware = new OpenTxFirmware(FIRMWAREID("tpro"), QCoreApplication::translate("Firmware", "Jumper T-Pro"), BOARD_JUMPER_TPRO);
|
||||
addOpenTxCommonOptions(firmware);
|
||||
@@ -1582,23 +1570,6 @@ void registerOpenTxFirmwares()
|
||||
registerOpenTxFirmware(firmware);
|
||||
addOpenTxRfOptions(firmware, FLEX + AFHDS2A + AFHDS3);
|
||||
|
||||
// /* 9XR-Pro */
|
||||
// firmware = new OpenTxFirmware(FIRMWAREID("9xrpro"), Firmware::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO);
|
||||
// addOpenTxArm9xOptions(firmware, false);
|
||||
// registerOpenTxFirmware(firmware, true);
|
||||
//
|
||||
// /* ar9x board */
|
||||
// firmware = new OpenTxFirmware(FIRMWAREID("ar9x"), Firmware::tr("9X with AR9X board"), BOARD_AR9X);
|
||||
// addOpenTxArm9xOptions(firmware, true);
|
||||
// //firmware->addOption("rtc", Firmware::tr("Optional RTC added"));
|
||||
// //firmware->addOption("volume", Firmware::tr("i2c volume control added"));
|
||||
// registerOpenTxFirmware(firmware, true);
|
||||
//
|
||||
// /* Sky9x board */
|
||||
// firmware = new OpenTxFirmware(FIRMWAREID("sky9x"), Firmware::tr("9X with Sky9x board"), BOARD_SKY9X);
|
||||
// addOpenTxArm9xOptions(firmware);
|
||||
// registerOpenTxFirmware(firmware, true);
|
||||
|
||||
Firmware::sortRegisteredFirmwares();
|
||||
Firmware::setDefaultVariant(Firmware::getFirmwareForFlavour("tx16s"));
|
||||
Firmware::setCurrentVariant(Firmware::getDefaultVariant());
|
||||
|
||||
Reference in New Issue
Block a user