chore: Support T-Lite F4 variant (#3254)
* TLite F4 * chore: Add to fw list for Buddy * chore(cpn): TLite F4 Companion support * fix: Remove seemingly incorect cmake set Or at least, the code now builds without that directive * fix(cpn): Stupid typo * chore: Actually build/register tlitef4 simulator * fix: Need tlitef4 flavor for simulator and updates * chore: tlitef4 can use tlite simulator * fix: downloadid AND simulatorid * fix: Correct simulatorid --------- Co-authored-by: Peter Feerick <peter.feerick@gmail.com> Co-authored-by: Peter Feerick <pfeerick@users.noreply.github.com>
This commit is contained in:
co-authored by
Peter Feerick
Peter Feerick
parent
2588e89ca1
commit
32e544c8dd
@@ -318,6 +318,8 @@ elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T12)
|
||||
set(FLAVOUR t12)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TLITE)
|
||||
set(FLAVOUR tlite)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TLITEF4)
|
||||
set(FLAVOUR tlitef4)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPRO)
|
||||
set(FLAVOUR tpro)
|
||||
elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TX12)
|
||||
|
||||
@@ -86,6 +86,7 @@ uint32_t Boards::getFourCC(Type board)
|
||||
case BOARD_JUMPER_T12:
|
||||
return 0x3D78746F;
|
||||
case BOARD_JUMPER_TLITE:
|
||||
case BOARD_JUMPER_TLITE_F4:
|
||||
return 0x4278746F;
|
||||
case BOARD_JUMPER_TPRO:
|
||||
return 0x4678746F;
|
||||
@@ -134,6 +135,7 @@ int Boards::getEEpromSize(Board::Type board)
|
||||
case BOARD_IFLIGHT_COMMANDO8:
|
||||
case BOARD_JUMPER_T12:
|
||||
case BOARD_JUMPER_TLITE:
|
||||
case BOARD_JUMPER_TLITE_F4:
|
||||
case BOARD_JUMPER_TPRO:
|
||||
case BOARD_RADIOMASTER_TX12:
|
||||
case BOARD_RADIOMASTER_TX12_MK2:
|
||||
@@ -178,6 +180,7 @@ int Boards::getFlashSize(Type board)
|
||||
case BOARD_IFLIGHT_COMMANDO8:
|
||||
case BOARD_JUMPER_T12:
|
||||
case BOARD_JUMPER_TLITE:
|
||||
case BOARD_JUMPER_TLITE_F4:
|
||||
case BOARD_JUMPER_TPRO:
|
||||
case BOARD_RADIOMASTER_TX12:
|
||||
case BOARD_RADIOMASTER_TX12_MK2:
|
||||
@@ -484,7 +487,9 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
|
||||
return 7;
|
||||
else if (board == BOARD_TARANIS_X7)
|
||||
return 8;
|
||||
else if (board == BOARD_JUMPER_TLITE || board == BOARD_JUMPER_TPRO || board == BOARD_BETAFPV_LR3PRO || board == BOARD_IFLIGHT_COMMANDO8)
|
||||
else if (board == BOARD_JUMPER_TLITE || BOARD_JUMPER_TLITE_F4 ||
|
||||
board == BOARD_JUMPER_TPRO || board == BOARD_BETAFPV_LR3PRO ||
|
||||
board == BOARD_IFLIGHT_COMMANDO8)
|
||||
return 4;
|
||||
else if (board == BOARD_FLYSKY_NV14)
|
||||
return 8;
|
||||
@@ -733,6 +738,8 @@ QString Boards::getBoardName(Board::Type board)
|
||||
return "Jumper T12";
|
||||
case BOARD_JUMPER_TLITE:
|
||||
return "Jumper T-Lite";
|
||||
case BOARD_JUMPER_TLITE_F4:
|
||||
return "Jumper T-Lite (F4 MCU)";
|
||||
case BOARD_JUMPER_TPRO:
|
||||
return "Jumper T-Pro";
|
||||
case BOARD_JUMPER_T16:
|
||||
@@ -964,6 +971,7 @@ int Boards::getDefaultInternalModules(Board::Type board)
|
||||
case BOARD_RADIOMASTER_TX12:
|
||||
case BOARD_RADIOMASTER_T8:
|
||||
case BOARD_JUMPER_TLITE:
|
||||
case BOARD_JUMPER_TLITE_F4:
|
||||
case BOARD_JUMPER_TPRO:
|
||||
return (int)MODULE_TYPE_MULTIMODULE;
|
||||
|
||||
|
||||
@@ -64,6 +64,7 @@ namespace Board {
|
||||
BOARD_RADIOMASTER_BOXER,
|
||||
BOARD_RADIOMASTER_T8,
|
||||
BOARD_JUMPER_TLITE,
|
||||
BOARD_JUMPER_TLITE_F4,
|
||||
BOARD_FLYSKY_NV14,
|
||||
BOARD_RADIOMASTER_ZORRO,
|
||||
BOARD_JUMPER_TPRO,
|
||||
@@ -263,7 +264,7 @@ inline bool IS_JUMPER_T12(Board::Type board)
|
||||
|
||||
inline bool IS_JUMPER_TLITE(Board::Type board)
|
||||
{
|
||||
return board == Board::BOARD_JUMPER_TLITE;
|
||||
return board == Board::BOARD_JUMPER_TLITE || board == Board::BOARD_JUMPER_TLITE_F4;
|
||||
}
|
||||
|
||||
inline bool IS_JUMPER_TPRO(Board::Type board)
|
||||
@@ -325,6 +326,7 @@ inline bool IS_FAMILY_T12(Board::Type board)
|
||||
board == Board::BOARD_RADIOMASTER_BOXER ||
|
||||
board == Board::BOARD_RADIOMASTER_T8 ||
|
||||
board == Board::BOARD_JUMPER_TLITE ||
|
||||
board == Board::BOARD_JUMPER_TLITE_F4 ||
|
||||
board == Board::BOARD_JUMPER_TPRO ||
|
||||
board == Board::BOARD_BETAFPV_LR3PRO ||
|
||||
board == Board::BOARD_IFLIGHT_COMMANDO8;
|
||||
|
||||
@@ -62,6 +62,8 @@ const char * OpenTxEepromInterface::getName()
|
||||
return "EdgeTX for Jumper T12";
|
||||
case BOARD_JUMPER_TLITE:
|
||||
return "EdgeTX for Jumper T-Lite";
|
||||
case BOARD_JUMPER_TLITE_F4:
|
||||
return "EdgeTX for Jumper T-Lite (F4 MCU)";
|
||||
case BOARD_JUMPER_TPRO:
|
||||
return "EdgeTX for Jumper T-Pro";
|
||||
case BOARD_JUMPER_T16:
|
||||
@@ -1304,6 +1306,16 @@ void registerOpenTxFirmwares()
|
||||
firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
|
||||
addOpenTxFontOptions(firmware);
|
||||
registerOpenTxFirmware(firmware);
|
||||
addOpenTxRfOptions(firmware, FLEX);
|
||||
|
||||
/* Jumper T-Lite F4 board */
|
||||
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 */
|
||||
|
||||
@@ -97,6 +97,7 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
|
||||
radioUiWidget = new SimulatedUIWidgetJumperT12(simulator, this);
|
||||
break;
|
||||
case Board::BOARD_JUMPER_TLITE:
|
||||
case Board::BOARD_JUMPER_TLITE_F4:
|
||||
radioUiWidget = new SimulatedUIWidgetJumperTLITE(simulator, this);
|
||||
break;
|
||||
case Board::BOARD_JUMPER_TPRO:
|
||||
|
||||
Reference in New Issue
Block a user