Removes the core in companion simu, compiled on VC++. A compiler bug? I
don't get it...
This commit is contained in:
@@ -144,13 +144,16 @@ void MdiChild::on_SimulateTxButton_clicked()
|
||||
{
|
||||
if (GetEepromInterface()->getSimulator()) {
|
||||
if (GetEepromInterface()->getCapability(SimulatorType)==1) {
|
||||
xsimulatorDialog sd(this);
|
||||
sd.loadParams(radioData);
|
||||
sd.exec();
|
||||
} else {
|
||||
simulatorDialog sd(this);
|
||||
sd.loadParams(radioData);
|
||||
sd.exec();
|
||||
xsimulatorDialog * sd = new xsimulatorDialog(this);
|
||||
sd->loadParams(radioData);
|
||||
sd->exec();
|
||||
delete sd;
|
||||
}
|
||||
else {
|
||||
simulatorDialog * sd = new simulatorDialog(this);
|
||||
sd->loadParams(radioData);
|
||||
sd->exec();
|
||||
delete sd;
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -194,12 +194,12 @@ void xsimulatorDialog::onButtonPressed(int value)
|
||||
void xsimulatorDialog::onTimerEvent()
|
||||
{
|
||||
static unsigned int lcd_counter = 0;
|
||||
|
||||
if (!simulator->timer10ms()) {
|
||||
QMessageBox::critical(this, "companion9x", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
|
||||
timer->stop();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
getValues();
|
||||
|
||||
if (g_modelIdx >= 0) {
|
||||
|
||||
@@ -73,7 +73,7 @@ OS_TID btTaskId;
|
||||
OS_STK btStack[BT_STACK_SIZE];
|
||||
#endif
|
||||
|
||||
#if defined(CPUARM) && defined(DEBUG)
|
||||
#if defined(DEBUG)
|
||||
OS_TID debugTaskId;
|
||||
OS_STK debugStack[DEBUG_STACK_SIZE];
|
||||
#endif
|
||||
|
||||
@@ -345,6 +345,11 @@ void StartMainThread(bool tests)
|
||||
getcwd(simuSdDirectory, 1024);
|
||||
#endif
|
||||
|
||||
#if defined(CPUARM)
|
||||
pthread_mutex_init(&mixerMutex, NULL);
|
||||
pthread_mutex_init(&audioMutex, NULL);
|
||||
#endif
|
||||
|
||||
main_thread_running = (tests ? 1 : 2);
|
||||
pthread_create(&main_thread_pid, NULL, &main_thread, NULL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user