diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 4fa2a8c806..2aac95858f 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -106,18 +106,18 @@ images/simulator/9X/9xcursmin.png images/simulator/9X/9xcursdown.png images/simulator/9X/9xcursphoto.png - images/simulator/Taranis/x9b0.png - images/simulator/Taranis/x9l0.png - images/simulator/Taranis/x9l1.png - images/simulator/Taranis/x9l2.png - images/simulator/Taranis/x9l3.png - images/simulator/Taranis/x9l4.png - images/simulator/Taranis/x9r0.png - images/simulator/Taranis/x9r1.png - images/simulator/Taranis/x9r2.png - images/simulator/Taranis/x9r3.png - images/simulator/Taranis/x9s0.png - images/simulator/Taranis/x9t0.png + images/simulator/X9D/x9b0.png + images/simulator/X9D/x9l0.png + images/simulator/X9D/x9l1.png + images/simulator/X9D/x9l2.png + images/simulator/X9D/x9l3.png + images/simulator/X9D/x9l4.png + images/simulator/X9D/x9r0.png + images/simulator/X9D/x9r1.png + images/simulator/X9D/x9r2.png + images/simulator/X9D/x9r3.png + images/simulator/X9D/x9s0.png + images/simulator/X9D/x9t0.png images/simulator/X7/bottom.png images/simulator/X7/left.png images/simulator/X7/left_exit.png diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 3f806c7e1f..508d641808 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -452,7 +452,7 @@ const QString Boards::getBoardName(Board::Type board) case BOARD_TARANIS_X9E: return "Taranis X9E"; case BOARD_TARANIS_X9LITE: - return "Taranis X3"; + return "Taranis X9Lite"; case BOARD_SKY9X: return "Sky9x"; case BOARD_9XRPRO: diff --git a/companion/src/firmwares/opentx/opentxeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h index dac1038283..1b33412448 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.h +++ b/companion/src/firmwares/opentx/opentxeeprom.h @@ -34,7 +34,7 @@ #define TARANIS_X7_VARIANT 0x4000 #define TARANIS_XLITE_VARIANT 0x2000 #define TARANIS_XLITES_VARIANT 0x1000 -#define TARANIS_X3_VARIANT 0x0800 +#define TARANIS_X9LITE_VARIANT 0x0800 #define SIMU_STOCK_VARIANTS (GVARS_VARIANT|FRSKY_VARIANT) #define SIMU_M128_VARIANTS (M128_VARIANT|SIMU_STOCK_VARIANTS) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index fe6fcd55df..4a4b06cc18 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -75,7 +75,7 @@ const char * OpenTxEepromInterface::getName() case BOARD_TARANIS_X7: return "OpenTX for FrSky Taranis X7"; case BOARD_TARANIS_X9LITE: - return "OpenTX for FrSky Taranis X3"; + return "OpenTX for FrSky Taranis X9Lite"; case BOARD_TARANIS_XLITE: return "OpenTX for FrSky Taranis X-Lite"; case BOARD_SKY9X: @@ -319,7 +319,7 @@ int OpenTxEepromInterface::save(uint8_t * eeprom, const RadioData & radioData, u variant |= TARANIS_X9E_VARIANT; } else if (IS_TARANIS_X9LITE(board)) { - variant |= TARANIS_X3_VARIANT; + variant |= TARANIS_X9LITE_VARIANT; } else if (IS_TARANIS_X7(board)) { variant |= TARANIS_X7_VARIANT; @@ -700,7 +700,7 @@ int OpenTxFirmware::getCapability(::Capability capability) else if (IS_TARANIS_X9E(board)) return TARANIS_X9E_VARIANT; else if (IS_TARANIS_X9LITE(board)) - return TARANIS_X3_VARIANT; + return TARANIS_X9LITE_VARIANT; else if (IS_TARANIS_X7(board)) return TARANIS_X7_VARIANT; else if (IS_TARANIS_XLITES(board)) @@ -1188,8 +1188,8 @@ void registerOpenTxFirmwares() addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware); - /* FrSky X3 board */ - firmware = new OpenTxFirmware("opentx-x3", Firmware::tr("FrSky Taranis X3"), BOARD_TARANIS_X9LITE); + /* FrSky X9Lite board */ + firmware = new OpenTxFirmware("opentx-x9lite", Firmware::tr("FrSky Taranis X9Lite"), BOARD_TARANIS_X9LITE); addOpenTxTaranisOptions(firmware, false); registerOpenTxFirmware(firmware); diff --git a/companion/src/images/simulator/Taranis/x9b0.png b/companion/src/images/simulator/X9D/x9b0.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9b0.png rename to companion/src/images/simulator/X9D/x9b0.png diff --git a/companion/src/images/simulator/Taranis/x9l0.png b/companion/src/images/simulator/X9D/x9l0.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9l0.png rename to companion/src/images/simulator/X9D/x9l0.png diff --git a/companion/src/images/simulator/Taranis/x9l1.png b/companion/src/images/simulator/X9D/x9l1.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9l1.png rename to companion/src/images/simulator/X9D/x9l1.png diff --git a/companion/src/images/simulator/Taranis/x9l2.png b/companion/src/images/simulator/X9D/x9l2.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9l2.png rename to companion/src/images/simulator/X9D/x9l2.png diff --git a/companion/src/images/simulator/Taranis/x9l3.png b/companion/src/images/simulator/X9D/x9l3.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9l3.png rename to companion/src/images/simulator/X9D/x9l3.png diff --git a/companion/src/images/simulator/Taranis/x9l4.png b/companion/src/images/simulator/X9D/x9l4.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9l4.png rename to companion/src/images/simulator/X9D/x9l4.png diff --git a/companion/src/images/simulator/Taranis/x9r0.png b/companion/src/images/simulator/X9D/x9r0.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9r0.png rename to companion/src/images/simulator/X9D/x9r0.png diff --git a/companion/src/images/simulator/Taranis/x9r1.png b/companion/src/images/simulator/X9D/x9r1.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9r1.png rename to companion/src/images/simulator/X9D/x9r1.png diff --git a/companion/src/images/simulator/Taranis/x9r2.png b/companion/src/images/simulator/X9D/x9r2.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9r2.png rename to companion/src/images/simulator/X9D/x9r2.png diff --git a/companion/src/images/simulator/Taranis/x9r3.png b/companion/src/images/simulator/X9D/x9r3.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9r3.png rename to companion/src/images/simulator/X9D/x9r3.png diff --git a/companion/src/images/simulator/Taranis/x9s0.png b/companion/src/images/simulator/X9D/x9s0.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9s0.png rename to companion/src/images/simulator/X9D/x9s0.png diff --git a/companion/src/images/simulator/Taranis/x9t0.png b/companion/src/images/simulator/X9D/x9t0.png similarity index 100% rename from companion/src/images/simulator/Taranis/x9t0.png rename to companion/src/images/simulator/X9D/x9t0.png diff --git a/companion/src/images/simulator/X9LITE/bottom.png b/companion/src/images/simulator/X9LITE/bottom.png new file mode 100644 index 0000000000..3f709a4494 Binary files /dev/null and b/companion/src/images/simulator/X9LITE/bottom.png differ diff --git a/companion/src/images/simulator/X9LITE/left.png b/companion/src/images/simulator/X9LITE/left.png new file mode 100644 index 0000000000..4d3376c48f Binary files /dev/null and b/companion/src/images/simulator/X9LITE/left.png differ diff --git a/companion/src/images/simulator/X9LITE/left_exit.png b/companion/src/images/simulator/X9LITE/left_exit.png new file mode 100644 index 0000000000..0d7cd5b5b4 Binary files /dev/null and b/companion/src/images/simulator/X9LITE/left_exit.png differ diff --git a/companion/src/images/simulator/X9LITE/left_menu.png b/companion/src/images/simulator/X9LITE/left_menu.png new file mode 100644 index 0000000000..b97ba1da4e Binary files /dev/null and b/companion/src/images/simulator/X9LITE/left_menu.png differ diff --git a/companion/src/images/simulator/X9LITE/left_page.png b/companion/src/images/simulator/X9LITE/left_page.png new file mode 100644 index 0000000000..9fd9d5b8e1 Binary files /dev/null and b/companion/src/images/simulator/X9LITE/left_page.png differ diff --git a/companion/src/images/simulator/X9LITE/left_scrnshot.png b/companion/src/images/simulator/X9LITE/left_scrnshot.png new file mode 100644 index 0000000000..c01e802de7 Binary files /dev/null and b/companion/src/images/simulator/X9LITE/left_scrnshot.png differ diff --git a/companion/src/images/simulator/X9LITE/right.png b/companion/src/images/simulator/X9LITE/right.png new file mode 100644 index 0000000000..73a2a1e30e Binary files /dev/null and b/companion/src/images/simulator/X9LITE/right.png differ diff --git a/companion/src/images/simulator/X9LITE/right_ent.png b/companion/src/images/simulator/X9LITE/right_ent.png new file mode 100644 index 0000000000..3292fb0e54 Binary files /dev/null and b/companion/src/images/simulator/X9LITE/right_ent.png differ diff --git a/companion/src/images/simulator/X9LITE/top.png b/companion/src/images/simulator/X9LITE/top.png new file mode 100644 index 0000000000..427ee09119 Binary files /dev/null and b/companion/src/images/simulator/X9LITE/top.png differ diff --git a/companion/src/simulation/simulateduiwidget.h b/companion/src/simulation/simulateduiwidget.h index 8496159832..5f17440aa6 100644 --- a/companion/src/simulation/simulateduiwidget.h +++ b/companion/src/simulation/simulateduiwidget.h @@ -104,7 +104,7 @@ class SimulatedUIWidget : public QWidget // Each subclass is responsible for its own Ui namespace Ui { class SimulatedUIWidget9X; - class SimulatedUIWidgetX3; + class SimulatedUIWidgetX9LITE; class SimulatedUIWidgetX7; class SimulatedUIWidgetX9; class SimulatedUIWidgetXLITE; @@ -129,16 +129,16 @@ class SimulatedUIWidget9X: public SimulatedUIWidget }; -class SimulatedUIWidgetX3: public SimulatedUIWidget +class SimulatedUIWidgetX9LITE: public SimulatedUIWidget { Q_OBJECT public: - explicit SimulatedUIWidgetX3(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX3(); + explicit SimulatedUIWidgetX9LITE(SimulatorInterface * simulator, QWidget * parent = nullptr); + virtual ~SimulatedUIWidgetX9LITE(); private: - Ui::SimulatedUIWidgetX3 * ui; + Ui::SimulatedUIWidgetX9LITE * ui; }; class SimulatedUIWidgetX7: public SimulatedUIWidget diff --git a/companion/src/simulation/simulateduiwidgetX9.cpp b/companion/src/simulation/simulateduiwidgetX9.cpp index cf3d3e3986..f1c2f44da2 100644 --- a/companion/src/simulation/simulateduiwidgetX9.cpp +++ b/companion/src/simulation/simulateduiwidgetX9.cpp @@ -40,15 +40,15 @@ SimulatedUIWidgetX9::SimulatedUIWidgetX9(SimulatorInterface *simulator, QWidget // left side act = new RadioUiAction(0, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU); - addRadioWidget(ui->leftbuttons->addArea(btn, "Taranis/x9l1.png", act)); + addRadioWidget(ui->leftbuttons->addArea(btn, "X9D/x9l1.png", act)); btn.moveTop(btn.top() + btn.height() + vsp); act = new RadioUiAction(3, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(btn, "Taranis/x9l2.png", act)); + addRadioWidget(ui->leftbuttons->addArea(btn, "X9D/x9l2.png", act)); btn.moveTop(btn.top() + btn.height() + vsp); act = new RadioUiAction(1, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(btn, "Taranis/x9l3.png", act)); + addRadioWidget(ui->leftbuttons->addArea(btn, "X9D/x9l3.png", act)); m_scrollUpAction = new RadioUiAction(4, QList() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_PLS); @@ -58,16 +58,16 @@ SimulatedUIWidgetX9::SimulatedUIWidgetX9(SimulatorInterface *simulator, QWidget // right side btn.moveTopLeft(QPoint(58, btop)); - addRadioWidget(ui->rightbuttons->addArea(btn, "Taranis/x9r1.png", m_scrollUpAction)); + addRadioWidget(ui->rightbuttons->addArea(btn, "X9D/x9r1.png", m_scrollUpAction)); btn.moveTop(btn.top() + btn.height() + vsp); - addRadioWidget(ui->rightbuttons->addArea(btn, "Taranis/x9r2.png", m_scrollDnAction)); + addRadioWidget(ui->rightbuttons->addArea(btn, "X9D/x9r2.png", m_scrollDnAction)); btn.moveTop(btn.top() + btn.height() + vsp); m_mouseMidClickAction = new RadioUiAction(2, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(btn, "Taranis/x9r3.png", m_mouseMidClickAction)); + addRadioWidget(ui->rightbuttons->addArea(btn, "X9D/x9r3.png", m_mouseMidClickAction)); - addRadioWidget(ui->leftbuttons->addArea(QRect(89, 177, 30, 20), "Taranis/x9l4.png", m_screenshotAction)); + addRadioWidget(ui->leftbuttons->addArea(QRect(89, 177, 30, 20), "X9D/x9l4.png", m_screenshotAction)); m_backlightColors << QColor(47, 123, 227); // Taranis Blue m_backlightColors << QColor(166,247,159); diff --git a/companion/src/simulation/simulateduiwidgetX9.ui b/companion/src/simulation/simulateduiwidgetX9.ui index 4c668ddd61..31228c7341 100644 --- a/companion/src/simulation/simulateduiwidgetX9.ui +++ b/companion/src/simulation/simulateduiwidgetX9.ui @@ -62,7 +62,7 @@ true - background:url(:/images/simulator/Taranis/x9l0.png); + background:url(:/images/simulator/X9D/x9l0.png); @@ -81,7 +81,7 @@ - background:url(:/images/simulator/Taranis/x9t0.png) + background:url(:/images/simulator/X9D/x9t0.png) @@ -100,7 +100,7 @@ - background:url(:/images/simulator/Taranis/x9r0.png) + background:url(:/images/simulator/X9D/x9r0.png) @@ -141,7 +141,7 @@ - background:url(:/images/simulator/Taranis/x9b0.png) + background:url(:/images/simulator/X9D/x9b0.png) diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.cpp b/companion/src/simulation/simulateduiwidgetX9LITE.cpp index fbb1fdc9fb..b14e7bfa62 100644 --- a/companion/src/simulation/simulateduiwidgetX9LITE.cpp +++ b/companion/src/simulation/simulateduiwidgetX9LITE.cpp @@ -3,9 +3,9 @@ // NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h -SimulatedUIWidgetX3::SimulatedUIWidgetX3(SimulatorInterface *simulator, QWidget * parent): +SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator, QWidget * parent): SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX3) + ui(new Ui::SimulatedUIWidgetX9LITE) { RadioUiAction * act; QPolygon polygon; @@ -17,24 +17,24 @@ SimulatedUIWidgetX3::SimulatedUIWidgetX3(SimulatorInterface *simulator, QWidget QPoint ctr(70, 91); polygon << polyArc(ctr.x(), ctr.y(), 50, -90, 90) << polyArc(ctr.x(), ctr.y(), 22, -90, 90); act = new RadioUiAction(3, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X3/left_page.png", act)); + addRadioWidget(ui->leftbuttons->addArea(polygon, "X9LITE/left_page.png", act)); act = new RadioUiAction(0, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(polyArc(ctr.x(), ctr.y(), 20), "X3/left_menu.png", act)); + addRadioWidget(ui->leftbuttons->addArea(polyArc(ctr.x(), ctr.y(), 20), "X9LITE/left_menu.png", act)); polygon.clear(); polygon << polyArc(ctr.x(), ctr.y(), 50, 90, 270) << polyArc(ctr.x(), ctr.y(), 22, 90, 270); act = new RadioUiAction(1, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X3/left_exit.png", act)); + addRadioWidget(ui->leftbuttons->addArea(polygon, "X9LITE/left_exit.png", act)); m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); connectScrollActions(); m_mouseMidClickAction = new RadioUiAction(2, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(polyArc(88, 92, 33), "X3/right_ent.png", m_mouseMidClickAction)); + addRadioWidget(ui->rightbuttons->addArea(polyArc(88, 92, 33), "X9LITE/right_ent.png", m_mouseMidClickAction)); - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 154, 30, 30), "X3/left_scrnshot.png", m_screenshotAction)); + addRadioWidget(ui->leftbuttons->addArea(QRect(9, 154, 30, 30), "X9LITE/left_scrnshot.png", m_screenshotAction)); m_backlightColors << QColor(215, 243, 255); // X3 Blue m_backlightColors << QColor(166,247,159); @@ -59,7 +59,7 @@ SimulatedUIWidgetX3::SimulatedUIWidgetX3(SimulatorInterface *simulator, QWidget tim->start(100); } -SimulatedUIWidgetX3::~SimulatedUIWidgetX3() +SimulatedUIWidgetX9LITE::~SimulatedUIWidgetX9LITE() { delete ui; } diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.ui b/companion/src/simulation/simulateduiwidgetX9LITE.ui index 297ad11c4a..afa1042315 100644 --- a/companion/src/simulation/simulateduiwidgetX9LITE.ui +++ b/companion/src/simulation/simulateduiwidgetX9LITE.ui @@ -1,7 +1,7 @@ - SimulatedUIWidgetX3 - + SimulatedUIWidgetX9LITE + 0 @@ -71,7 +71,7 @@ - background:url(:/images/simulator/X7/left.png); + background:url(:/images/simulator/X9LITE/left.png); @@ -121,7 +121,7 @@ - background:url(:/images/simulator/X7/right.png) + background:url(:/images/simulator/X9LITE/right.png) @@ -146,7 +146,7 @@ - background:url(:/images/simulator/X7/top.png) + background:url(:/images/simulator/X9LITE/top.png) @@ -171,7 +171,7 @@ - background:url(:/images/simulator/X7/bottom.png) + background:url(:/images/simulator/X9LITE/bottom.png) diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index 1205b50083..9a74758394 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -69,7 +69,7 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato switch(m_board) { case Board::BOARD_TARANIS_X9LITE: - radioUiWidget = new SimulatedUIWidgetX3(simulator, this); + radioUiWidget = new SimulatedUIWidgetX9LITE(simulator, this); break; case Board::BOARD_TARANIS_X7: radioUiWidget = new SimulatedUIWidgetX7(simulator, this); diff --git a/tools/build-frsky.py b/tools/build-frsky.py index e00b646e1c..e0474e97d0 100755 --- a/tools/build-frsky.py +++ b/tools/build-frsky.py @@ -14,7 +14,7 @@ options = { "LUA": "NO_MODEL_SCRIPTS", "GVARS": "YES" }, - "X3": { + "X9LITE": { "PXX1": "NO", "LUA": "NO_MODEL_SCRIPTS", "GVARS": "YES",