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

Bsongis/x7d companion support (#4028)

Browse Source 
[X7D] Companion support added
This commit is contained in:
Bertrand Songis
2016-11-16 12:59:15 +01:00
committed by GitHub
parent 4dda2c64d3
commit fb27acf286
22 changed files with 314 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/simulatordialog9x.cpp
+8 -8
View File
@@ -55,14 +55,14 @@ SimulatorDialog9X::SimulatorDialog9X(QWidget * parent, SimulatorInterface *simul
if (g.simuSW())
restoreSwitches();
ui->trimHR_L->setText(QString::fromUtf8(leftArrow));
ui->trimHR_R->setText(QString::fromUtf8(rightArrow));
ui->trimVR_U->setText(QString::fromUtf8(upArrow));
ui->trimVR_D->setText(QString::fromUtf8(downArrow));
ui->trimHL_L->setText(QString::fromUtf8(leftArrow));
ui->trimHL_R->setText(QString::fromUtf8(rightArrow));
ui->trimVL_U->setText(QString::fromUtf8(upArrow));
ui->trimVL_D->setText(QString::fromUtf8(downArrow));
ui->trimHR_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHR_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVR_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVR_D->setText(QString::fromUtf8(ARROW_DOWN));
ui->trimHL_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHL_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVL_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVL_D->setText(QString::fromUtf8(ARROW_DOWN));
for (int i=0; i<pots.count(); i++) {
pots[i]->setProperty("index", i);
connect(pots[i], SIGNAL(valueChanged(int)), this, SLOT(dialChanged(int)));
companion/src/simulation/simulatordialogflamenco.cpp
+8 -8
View File
@@ -25,14 +25,14 @@ SimulatorDialogFlamenco::SimulatorDialogFlamenco(QWidget * parent, SimulatorInte
if (g.simuSW())
restoreSwitches();
ui->trimHR_L->setText(QString::fromUtf8(leftArrow));
ui->trimHR_R->setText(QString::fromUtf8(rightArrow));
ui->trimVR_U->setText(QString::fromUtf8(upArrow));
ui->trimVR_D->setText(QString::fromUtf8(downArrow));
ui->trimHL_L->setText(QString::fromUtf8(leftArrow));
ui->trimHL_R->setText(QString::fromUtf8(rightArrow));
ui->trimVL_U->setText(QString::fromUtf8(upArrow));
ui->trimVL_D->setText(QString::fromUtf8(downArrow));
ui->trimHR_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHR_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVR_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVR_D->setText(QString::fromUtf8(ARROW_DOWN));
ui->trimHL_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHL_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVL_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVL_D->setText(QString::fromUtf8(ARROW_DOWN));
connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
companion/src/simulation/simulatordialoghorus.cpp
+8 -8
View File
@@ -43,14 +43,14 @@ SimulatorDialogHorus::SimulatorDialogHorus(QWidget * parent, SimulatorInterface
if (g.simuSW())
restoreSwitches();
ui->trimHR_L->setText(QString::fromUtf8(leftArrow));
ui->trimHR_R->setText(QString::fromUtf8(rightArrow));
ui->trimVR_U->setText(QString::fromUtf8(upArrow));
ui->trimVR_D->setText(QString::fromUtf8(downArrow));
ui->trimHL_L->setText(QString::fromUtf8(leftArrow));
ui->trimHL_R->setText(QString::fromUtf8(rightArrow));
ui->trimVL_U->setText(QString::fromUtf8(upArrow));
ui->trimVL_D->setText(QString::fromUtf8(downArrow));
ui->trimHR_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHR_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVR_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVR_D->setText(QString::fromUtf8(ARROW_DOWN));
ui->trimHL_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHL_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVL_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVL_D->setText(QString::fromUtf8(ARROW_DOWN));
connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
companion/src/simulation/simulatordialogtaranis.cpp
+8 -8
View File
@@ -50,14 +50,14 @@ SimulatorDialogTaranis::SimulatorDialogTaranis(QWidget * parent, SimulatorInterf
}
}
ui->trimHR_L->setText(QString::fromUtf8(leftArrow));
ui->trimHR_R->setText(QString::fromUtf8(rightArrow));
ui->trimVR_U->setText(QString::fromUtf8(upArrow));
ui->trimVR_D->setText(QString::fromUtf8(downArrow));
ui->trimHL_L->setText(QString::fromUtf8(leftArrow));
ui->trimHL_R->setText(QString::fromUtf8(rightArrow));
ui->trimVL_U->setText(QString::fromUtf8(upArrow));
ui->trimVL_D->setText(QString::fromUtf8(downArrow));
ui->trimHR_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHR_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVR_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVR_D->setText(QString::fromUtf8(ARROW_DOWN));
ui->trimHL_L->setText(QString::fromUtf8(ARROW_LEFT));
ui->trimHL_R->setText(QString::fromUtf8(ARROW_RIGHT));
ui->trimVL_U->setText(QString::fromUtf8(ARROW_UP));
ui->trimVL_D->setText(QString::fromUtf8(ARROW_DOWN));
connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
companion/src/simulation/simulatorinterface.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ void registerSimulator(const QString &filename)
typedef SimulatorFactory * (*RegisterSimulator)();
RegisterSimulator registerSimulator = (RegisterSimulator)lib.resolve("registerSimu");
if (registerSimulator) {
SimulatorFactory *factory = registerSimulator();
SimulatorFactory * factory = registerSimulator();
registerSimulatorFactory(factory);
}
else {