diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 2feff463d..b5acd02c9 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -70,6 +70,7 @@ uint32_t Boards::getFourCC(Type board) return 0x3578746F; case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9DP: + case BOARD_TARANIS_X9DP_2019: return 0x3378746F; case BOARD_TARANIS_X9LITE: return 0x3C78746F; @@ -113,6 +114,7 @@ const int Boards::getEEpromSize(Board::Type board) case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9DP: + case BOARD_TARANIS_X9DP_2019: case BOARD_TARANIS_X9E: case BOARD_JUMPER_T12: return EESIZE_TARANIS; @@ -147,6 +149,7 @@ const int Boards::getFlashSize(Type board) case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9DP: + case BOARD_TARANIS_X9DP_2019: case BOARD_TARANIS_X9E: case BOARD_JUMPER_T12: return FSIZE_TARANIS; @@ -483,6 +486,8 @@ const QString Boards::getBoardName(Board::Type board) return "Taranis X9D"; case BOARD_TARANIS_X9DP: return "Taranis X9D+"; + case BOARD_TARANIS_X9DP_2019: + return "Taranis X9D+ 2019"; case BOARD_TARANIS_X9E: return "Taranis X9E"; case BOARD_TARANIS_X9LITE: diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h index e9fe9ae54..efb1b2be1 100644 --- a/companion/src/firmwares/boards.h +++ b/companion/src/firmwares/boards.h @@ -42,13 +42,14 @@ namespace Board { BOARD_TARANIS_X7, BOARD_TARANIS_X9D, BOARD_TARANIS_X9DP, + BOARD_TARANIS_X9DP_2019, BOARD_TARANIS_X9E, BOARD_X12S, BOARD_X10, BOARD_TARANIS_XLITE, BOARD_TARANIS_XLITES, BOARD_TARANIS_X9LITE, - BOARD_JUMPER_T12 + BOARD_JUMPER_T12, }; constexpr int BOARD_TYPE_MAX = BOARD_JUMPER_T12 ; @@ -196,8 +197,8 @@ class Boards #define IS_TARANIS_XLITES(board) (board==Board::BOARD_TARANIS_XLITES) #define IS_TARANIS_X7(board) (board==Board::BOARD_TARANIS_X7) #define IS_TARANIS_X9LITE(board) (board==Board::BOARD_TARANIS_X9LITE) -#define IS_TARANIS_X9(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E) -#define IS_TARANIS_X9D(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP) +#define IS_TARANIS_X9(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9DP_2019 || board==Board::BOARD_TARANIS_X9E) +#define IS_TARANIS_X9D(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9DP_2019) #define IS_TARANIS_PLUS(board) (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E) #define IS_TARANIS_X9E(board) (board==Board::BOARD_TARANIS_X9E) #define IS_TARANIS(board) (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_X9LITE(board) || IS_TARANIS_XLITE(board) || IS_JUMPER_T12(board)) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 9ebda4d32..e6653598c 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -72,6 +72,8 @@ const char * OpenTxEepromInterface::getName() return "OpenTX for FrSky Taranis X9D"; case BOARD_TARANIS_X9DP: return "OpenTX for FrSky Taranis X9D+"; + case BOARD_TARANIS_X9DP_2019: + return "OpenTX for FrSky Taranis X9D+ 2019"; case BOARD_TARANIS_X9E: return "OpenTX for FrSky Taranis X9E"; case BOARD_TARANIS_X7: @@ -1209,6 +1211,13 @@ void registerOpenTxFirmwares() addPPMInternalModuleHack(firmware); registerOpenTxFirmware(firmware); + /* FrSky Taranis X9D+ board */ + firmware = new OpenTxFirmware("opentx-x9d+2019", Firmware::tr("FrSky Taranis X9D+ 2019"), BOARD_TARANIS_X9DP_2019); + firmware->addOption("noras", Firmware::tr("Disable RAS (SWR)")); + addOpenTxTaranisOptions(firmware); + addPPMInternalModuleHack(firmware); + registerOpenTxFirmware(firmware); + /* FrSky Taranis X9D board */ firmware = new OpenTxFirmware("opentx-x9d", Firmware::tr("FrSky Taranis X9D"), BOARD_TARANIS_X9D); firmware->addOption("haptic", Firmware::tr("Haptic module installed")); diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index e945d7a65..2ec00381d 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -76,6 +76,7 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato break; case Board::BOARD_TARANIS_X9D: case Board::BOARD_TARANIS_X9DP: + case Board::BOARD_TARANIS_X9DP_2019: radioUiWidget = new SimulatedUIWidgetX9(simulator, this); break; case Board::BOARD_TARANIS_XLITE: