Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build_fw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
- tx15 # RadioMaster
- tx16s;tx16smk3 # RadioMaster
- h17 # Senduwing
- t18h7 # Jumper
container:
image: ghcr.io/edgetx/edgetx-dev:latest
volumes:
Expand Down Expand Up @@ -94,6 +95,7 @@ jobs:
- tx15;tx16s;tx16smk3 # RadioMaster
- zorro # RadioMaster
- h17 # Senduwing
- t18h7 # Jumper
container:
image: ghcr.io/edgetx/edgetx-dev:latest
volumes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- x10;x10express;x12s;x7access;x9dp2019;x9e # FrSky
- v12;v14;v14lcd;v15;v16 # HelloRadioSky
- c14;commando8 # iFlight
- bumblebee;t12max;t14;t15;t15h7;t15pro;t16;t18;t20;t20v2;t22;tpros;tprov2 # Jumper
- bumblebee;t12max;t14;t15;t15h7;t15pro;t16;t18;t18h7;t20;t20v2;t22;tpros;tprov2 # Jumper
- boxer;gx12;gx15;mt12;pocket;tx12mk2;tx15;tx16s;tx16smk3;zorro # RadioMaster
- h17 # Senduwing
container:
Expand Down
4 changes: 2 additions & 2 deletions companion/src/firmwares/boardjson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ void BoardJson::afterLoadFixups(Board::Type board, InputsTable * inputs, Switche
{
// TODO json files do not contain gyro defs
// Radio cmake directive IMU is currently used
// H17 has no IMU
// H17 and T18H7 have no IMU
if ((IS_TARANIS_XLITES(board) || IS_FAMILY_HORUS_OR_T16(board) ||
IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_GX15(board) ||
IS_RADIOMASTER_TX16SMK3(board) || IS_FLYSKY_PA01(board)) &&
!IS_SENDUWING_H17(board)) {
!IS_SENDUWING_H17(board) && !IS_JUMPER_T18H7(board)) {
if (getInputIndex(inputs, "TILT_X", Board::LVT_TAG) < 0) {
InputDefn defn;
defn.type = AIT_FLEX;
Expand Down
7 changes: 6 additions & 1 deletion companion/src/firmwares/boards.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ int Boards::getEEpromSize(Board::Type board)
case BOARD_JUMPER_T22:
case BOARD_JUMPER_T16:
case BOARD_JUMPER_T18:
case BOARD_JUMPER_T18H7:
case BOARD_RADIOMASTER_TX16S:
case BOARD_RADIOMASTER_TX16SMK3:
case BOARD_RADIOMASTER_TX15:
Expand Down Expand Up @@ -300,6 +301,7 @@ int Boards::getFlashSize(Type board)
case BOARD_JUMPER_T22:
case BOARD_JUMPER_T16:
case BOARD_JUMPER_T18:
case BOARD_JUMPER_T18H7:
case BOARD_RADIOMASTER_TX16S:
case BOARD_RADIOMASTER_TX16SMK3:
case BOARD_RADIOMASTER_TX15:
Expand Down Expand Up @@ -433,7 +435,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
IS_RADIOMASTER_POCKET(board) || IS_RADIOMASTER_TX12(board) ||
IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_TX16S(board) ||
IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX15(board) ||
IS_JUMPER_T15PRO(board) || IS_JUMPER_T15H7(board) ||
IS_JUMPER_T15PRO(board) || IS_JUMPER_T15H7(board) || IS_JUMPER_T18H7(board) ||
IS_FLYSKY_PA01(board) || IS_FLYSKY_ST16(board) ||
IS_RADIOMASTER_TX16SMK3(board) || IS_IFLIGHT_C14(board) ||
IS_RADIOMASTER_GX15(board) || IS_SENDUWING_H17(board));
Expand Down Expand Up @@ -654,6 +656,8 @@ QString Boards::getBoardName(Board::Type board)
return "Jumper T16";
case BOARD_JUMPER_T18:
return "Jumper T18";
case BOARD_JUMPER_T18H7:
return "Jumper T18H7";
case BOARD_JUMPER_T20:
return "Jumper T20";
case BOARD_JUMPER_T20V2:
Expand Down Expand Up @@ -840,6 +844,7 @@ int Boards::getDefaultInternalModules(Board::Type board)
case BOARD_JUMPER_T15:
case BOARD_JUMPER_T15PRO:
case BOARD_JUMPER_T15H7:
case BOARD_JUMPER_T18H7:
case BOARD_JUMPER_T22:
case BOARD_JUMPER_T20:
case BOARD_JUMPER_TPROS:
Expand Down
7 changes: 7 additions & 0 deletions companion/src/firmwares/boards.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ namespace Board {
BOARD_IFLIGHT_COMMANDO14,
BOARD_HELLORADIOSKY_V12,
BOARD_SENDUWING_H17,
BOARD_JUMPER_T18H7,
BOARD_TYPE_COUNT,
BOARD_TYPE_MAX = BOARD_TYPE_COUNT - 1
};
Expand Down Expand Up @@ -607,6 +608,11 @@ inline bool IS_JUMPER_T18(Board::Type board)
return board == Board::BOARD_JUMPER_T18;
}

inline bool IS_JUMPER_T18H7(Board::Type board)
{
return board == Board::BOARD_JUMPER_T18H7;
}

inline bool IS_JUMPER_T20(Board::Type board)
{
return board == Board::BOARD_JUMPER_T20 || board == Board::BOARD_JUMPER_T20V2;
Expand Down Expand Up @@ -713,6 +719,7 @@ inline bool IS_FAMILY_T16(Board::Type board)
board == Board::BOARD_JUMPER_T15H7 ||
board == Board::BOARD_JUMPER_T16 ||
board == Board::BOARD_JUMPER_T18 ||
board == Board::BOARD_JUMPER_T18H7 ||
board == Board::BOARD_RADIOMASTER_TX15 ||
board == Board::BOARD_RADIOMASTER_GX15 ||
board == Board::BOARD_RADIOMASTER_TX16S ||
Expand Down
8 changes: 7 additions & 1 deletion companion/src/firmwares/opentx/opentxinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ int OpenTxFirmware::getCapability(::Capability capability)
return id.contains("internalelrs") || IS_RADIOMASTER_TX12_MK2(board) ||
IS_IFLIGHT_COMMANDO8(board) || IS_RADIOMASTER_BOXER(board) ||
IS_RADIOMASTER_POCKET(board) || IS_JUMPER_T20(board) ||
IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_GX15(board) || IS_JUMPER_T15PRO(board) || IS_JUMPER_T15H7(board) || IS_JUMPER_T22(board) ||
IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_GX15(board) || IS_JUMPER_T15PRO(board) || IS_JUMPER_T15H7(board) || IS_JUMPER_T22(board) || IS_JUMPER_T18H7(board) ||
IS_SENDUWING_H17(board);
case HasIntModuleFlySky:
return id.contains("afhds2a") || id.contains("afhds3") ||
Expand Down Expand Up @@ -642,6 +642,12 @@ void registerOpenTxFirmwares()
addOpenTxRfOptions(firmware, FLEX);
registerOpenTxFirmware(firmware);

/* Jumper T18H7 board */
firmware = new OpenTxFirmware(FIRMWAREID("t18h7"), Firmware::tr("Jumper T18H7"), BOARD_JUMPER_T18H7);
addOpenTxFrskyOptions(firmware);
addOpenTxRfOptions(firmware, FLEX);
registerOpenTxFirmware(firmware);

/* Jumper T22 board */
firmware = new OpenTxFirmware(FIRMWAREID("t22"), Firmware::tr("T22"), BOARD_JUMPER_T22);
addOpenTxFrskyOptions(firmware);
Expand Down
1 change: 1 addition & 0 deletions fw.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
["Jumper T15-H7", "t15h7-"],
["Jumper T16", "t16-"],
["Jumper T18", "t18-"],
["Jumper T18H7", "t18h7-"],
["Jumper T20", "t20-"],
["Jumper T20 V2", "t20v2-"],
["Jumper T22", "t22-"],
Expand Down
4 changes: 3 additions & 1 deletion radio/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(CMakeForceCompiler)
include(Bitmaps)

set(PCB_TYPES X9LITE X9LITES X7 XLITE XLITES X9D X9D+ X9E X10 X12S PL18 T15PRO T15H7 ST16 PA01 TX15 GX15 TX16SMK3 T22 V12 H17 V15)
set(PCB_TYPES X9LITE X9LITES X7 XLITE XLITES X9D X9D+ X9E X10 X12S PL18 T15PRO T15H7 T18H7 ST16 PA01 TX15 GX15 TX16SMK3 T22 V12 H17 V15)
set(RADIO_LANGUAGES CN CZ DA DE EN ES FI FR HE HU IT JP KO NL PL PT RU SE SK TW UA)
set(TTS_LANGUAGES CN CZ DA DE EN ES FI FR HE HU IT JP KO NL PL PT RU SE SK TW UA)

Expand Down Expand Up @@ -90,6 +90,8 @@ elseif(PCB STREQUAL T15PRO)
include(targets/t15pro/CMakeLists.txt)
elseif(PCB STREQUAL T15H7)
include(targets/t15h7/CMakeLists.txt)
elseif(PCB STREQUAL T18H7)
include(targets/t18h7/CMakeLists.txt)
elseif(PCB STREQUAL ST16)
include(targets/st16/CMakeLists.txt)
elseif(PCB STREQUAL C14)
Expand Down
Loading
Loading