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

Fixes #1086

Browse Source
This commit is contained in:
bsongis
2014-05-13 11:57:36 +02:00
parent 6225609f0e
commit 2c2278a9ed
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/simulatordialog.cpp
+7 -7
View File
@@ -511,16 +511,16 @@ void SimulatorDialog::onTimerEvent()
}
}
//display current flight mode in window title
// display current flight mode in window title
unsigned int currentPhase = simulator->getPhase();
if (currentPhase != lastPhase) {
lastPhase = currentPhase;
const char * phase_name = simulator->getPhaseName(currentPhase);
if ( phase_name && phase_name[0] ) {
setWindowTitle(windowName + QString(" [fm: %1]").arg(QString(phase_name)));
if (phase_name && phase_name[0]) {
setWindowTitle(windowName + QString(" - Flight Mode %1").arg(QString(phase_name)));
}
else {
setWindowTitle(windowName + QString(" [fm: %1]").arg(simulator->getPhase()));
setWindowTitle(windowName + QString(" - Flight Mode %1").arg(simulator->getPhase()));
}
}
@@ -834,9 +834,9 @@ void SimulatorDialog::setValues()
logicalSwitchLabels[i]->setStyleSheet(outputs.vsw[i] ? CSWITCH_ON : CSWITCH_OFF);
}
for (unsigned int fm=0; fm<numFlightModes; fm++) {
for (unsigned int gv=0; gv<numGvars; gv++) {
gvarValues[fm*numGvars+gv]->setText(QString("%1").arg(outputs.gvars[fm][gv]));
for (unsigned int gv=0; gv<numGvars; gv++) {
for (unsigned int fm=0; fm<numFlightModes; fm++) {
gvarValues[gv*numFlightModes+fm]->setText(QString("%1").arg(outputs.gvars[fm][gv]));
}
}
companion/src/simulation/simulatorimport.h
+1 -1
View File
@@ -60,7 +60,7 @@ for (int i=0; i<NUM_LOGICAL_SWITCH; i++)
outputs.vsw[i] = getSwitch(SWSRC_SW1+i, 0);
#endif
#ifdef GVAR_VALUE // defined(GVARS)
uint8_t phase = getFlightPhase();
/* TODO it could be a good idea instead of getPhase() / getPhaseName() outputs.phase = getFlightPhase(); */
for (int fm=0; fm<MAX_FLIGHT_MODES; fm++)
for (int gv=0; gv<MAX_GVARS; gv++)
outputs.gvars[fm][gv] = GVAR_VALUE(gv, fm);
companion/src/simulation/simulatorinterface.h
+1
View File
@@ -38,6 +38,7 @@ class TxOutputs {
bool vsw[32]; /* TODO NUM_VIRTUAL_SWITCHES */
int16_t gvars[9][9]; /*TODO MAX_FLIGHT_MODES, NUM_GVARS */
unsigned int beep;
// uint8_t phase;
};
struct Trims {