Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-25 01:05:08 +03:00
Code Activity

[Simulator] Fix data not being saved back to file in standalone simulator when using .otx file with non-Horus radio types.

Browse source
This commit is contained in:
Max Paperno 2017-04-11 19:11:31 -04:00
parent 350c3a6d44
commit c2ef10724d
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
companion/src/simulation/simulatorwidget.cpp
View file

@ -118,13 +118,11 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
connect(this, &SimulatorWidget::simulatorInit, simulator, &SimulatorInterface::init); connect(this, &SimulatorWidget::simulatorInit, simulator, &SimulatorInterface::init);
connect(this, &SimulatorWidget::simulatorStart, simulator, &SimulatorInterface::start); connect(this, &SimulatorWidget::simulatorStart, simulator, &SimulatorInterface::start);
connect(this, &SimulatorWidget::simulatorStop, simulator, &SimulatorInterface::stop); connect(this, &SimulatorWidget::simulatorStop, simulator, &SimulatorInterface::stop);
//connect(this, &SimulatorWidget::simulatorSetData, simulator, &SimulatorInterface::setRadioData);
connect(this, &SimulatorWidget::inputValueChange, simulator, &SimulatorInterface::setInputValue); connect(this, &SimulatorWidget::inputValueChange, simulator, &SimulatorInterface::setInputValue);
connect(this, &SimulatorWidget::simulatorSdPathChange, simulator, &SimulatorInterface::setSdPath); connect(this, &SimulatorWidget::simulatorSdPathChange, simulator, &SimulatorInterface::setSdPath);
connect(this, &SimulatorWidget::simulatorVolumeGainChange, simulator, &SimulatorInterface::setVolumeGain); connect(this, &SimulatorWidget::simulatorVolumeGainChange, simulator, &SimulatorInterface::setVolumeGain);
connect(simulator, &SimulatorInterface::started, this, &SimulatorWidget::onSimulatorStarted); connect(simulator, &SimulatorInterface::started, this, &SimulatorWidget::onSimulatorStarted);
connect(simulator, &SimulatorInterface::stopped, this, &SimulatorWidget::onSimulatorStopped);
connect(simulator, &SimulatorInterface::heartbeat, this, &SimulatorWidget::onSimulatorHeartbeat); connect(simulator, &SimulatorInterface::heartbeat, this, &SimulatorWidget::onSimulatorHeartbeat);
connect(simulator, &SimulatorInterface::runtimeError, this, &SimulatorWidget::onSimulatorError); connect(simulator, &SimulatorInterface::runtimeError, this, &SimulatorWidget::onSimulatorError);
connect(simulator, &SimulatorInterface::phaseChanged, this, &SimulatorWidget::onPhaseChanged); connect(simulator, &SimulatorInterface::phaseChanged, this, &SimulatorWidget::onPhaseChanged);
@ -467,10 +465,11 @@ void SimulatorWidget::stop()
while (simulator->isRunning()) { while (simulator->isRunning()) {
if (tmout.hasExpired(2000)) { if (tmout.hasExpired(2000)) {
onSimulatorError("Timeout while trying to stop simulation!"); onSimulatorError("Timeout while trying to stop simulation!");
break;
}
QApplication::processEvents();
}
onSimulatorStopped(); onSimulatorStopped();
return;
}
}
} }
void SimulatorWidget::onSimulatorStarted() void SimulatorWidget::onSimulatorStarted()