piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[X9 Lite] Simulator keys fixed

Browse Source
This commit is contained in:
Bertrand Songis
2019-05-13 15:10:13 +02:00
parent 0d13e10a55
commit d8f547328b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/boards.cpp
+1 -1
View File
@@ -452,7 +452,7 @@ const QString Boards::getBoardName(Board::Type board)
case BOARD_TARANIS_X9E:
return "Taranis X9E";
case BOARD_TARANIS_X9LITE:
return "Taranis X9Lite";
return "Taranis X9-Lite";
case BOARD_SKY9X:
return "Sky9x";
case BOARD_9XRPRO:
companion/src/firmwares/opentx/opentxinterface.cpp
+4 -4
View File
@@ -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 X9Lite";
return "OpenTX for FrSky Taranis X9-Lite";
case BOARD_TARANIS_XLITE:
return "OpenTX for FrSky Taranis X-Lite";
case BOARD_SKY9X:
@@ -1188,8 +1188,8 @@ void registerOpenTxFirmwares()
addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware);
/* FrSky X9Lite board */
firmware = new OpenTxFirmware("opentx-x9lite", Firmware::tr("FrSky Taranis X9Lite"), BOARD_TARANIS_X9LITE);
/* FrSky X9-Lite board */
firmware = new OpenTxFirmware("opentx-x9lite", Firmware::tr("FrSky Taranis X9-Lite"), BOARD_TARANIS_X9LITE);
addOpenTxTaranisOptions(firmware, false);
registerOpenTxFirmware(firmware);
@@ -1198,7 +1198,7 @@ void registerOpenTxFirmwares()
addOpenTxTaranisOptions(firmware, false);
registerOpenTxFirmware(firmware);
/* FrSky X-Lite S board */
/* FrSky X-Lite S/PRO board */
firmware = new OpenTxFirmware("opentx-xlites", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES);
// firmware->addOption("stdr9m", QCoreApplication::translate("Firmware", "Use JR-sized R9M module"));
addOpenTxTaranisOptions(firmware);
companion/src/simulation/simulateduiwidgetX9LITE.cpp
+3 -3
View File
@@ -16,10 +16,10 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator,
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<int>() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_PAGE);
act = new RadioUiAction(0, QList<int>() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_PAGE);
addRadioWidget(ui->leftbuttons->addArea(polygon, "X9LITE/left_page.png", act));
act = new RadioUiAction(0, QList<int>() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_MENU_ICN);
act = new RadioUiAction(3, QList<int>() << 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), "X9LITE/left_menu.png", act));
polygon.clear();
@@ -36,7 +36,7 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator,
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(215, 243, 255); // X9LITE Blue
m_backlightColors << QColor(166,247,159);
m_backlightColors << QColor(247,159,166);
m_backlightColors << QColor(255,195,151);
radio/src/sdcard.h
+2 -2
View File
@@ -141,8 +141,8 @@ const char * getBasename(const char * path);
#define OTX_FOURCC 0x3678746F // otx for Taranis X7
#define O9X_FOURCC 0x3378396F // o9x for Taranis X7
#elif defined(PCBX9LITE)
#define OTX_FOURCC 0x3C78746F // otx for Taranis X9Lite
#define O9X_FOURCC 0x3C78396F // o9x for Taranis X9Lite
#define OTX_FOURCC 0x3C78746F // otx for Taranis X9-Lite
#define O9X_FOURCC 0x3C78396F // o9x for Taranis X9-Lite
#elif defined(PCBX9D) || defined(PCBX9DP)
#define OTX_FOURCC 0x3378746F // otx for Taranis X9D
#define O9X_FOURCC 0x3378396F // o9x for Taranis X9D