Re #2260: class Profile dependency removed from simulatorinterface
This commit is contained in:
@@ -182,7 +182,7 @@ bool Er9xSimulator::lcdChanged(bool & lightEnable)
|
|||||||
#include "simulatorimport.h"
|
#include "simulatorimport.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
void Er9xSimulator::start(RadioData &radioData, const Profile & profile, bool tests)
|
void Er9xSimulator::start(RadioData &radioData, bool tests)
|
||||||
{
|
{
|
||||||
er9xInterface->save(&eeprom[0], radioData);
|
er9xInterface->save(&eeprom[0], radioData);
|
||||||
StartMainThread(tests);
|
StartMainThread(tests);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class Er9xSimulator : public SimulatorInterface {
|
|||||||
|
|
||||||
Er9xSimulator(Er9xInterface *);
|
Er9xSimulator(Er9xInterface *);
|
||||||
|
|
||||||
virtual void start(RadioData & radioData, const Profile & profile, bool tests);
|
virtual void start(RadioData & radioData, bool tests);
|
||||||
|
|
||||||
virtual void stop();
|
virtual void stop();
|
||||||
|
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ bool Ersky9xSimulator::lcdChanged(bool & lightEnable)
|
|||||||
#include "simulatorimport.h"
|
#include "simulatorimport.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
void Ersky9xSimulator::start(RadioData &radioData, const Profile & profile, bool tests)
|
void Ersky9xSimulator::start(RadioData &radioData, bool tests)
|
||||||
{
|
{
|
||||||
ersky9xInterface->save(Ersky9x::eeprom, radioData);
|
ersky9xInterface->save(Ersky9x::eeprom, radioData);
|
||||||
StartEepromThread(NULL);
|
StartEepromThread(NULL);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class Ersky9xSimulator : public SimulatorInterface {
|
|||||||
|
|
||||||
Ersky9xSimulator(Ersky9xInterface *);
|
Ersky9xSimulator(Ersky9xInterface *);
|
||||||
|
|
||||||
virtual void start(RadioData & radioData, const Profile & profile, bool tests);
|
virtual void start(RadioData & radioData, bool tests);
|
||||||
|
|
||||||
virtual void stop();
|
virtual void stop();
|
||||||
|
|
||||||
|
|||||||
@@ -339,6 +339,19 @@ OpenTxSimulator::OpenTxSimulator()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OpenTxSimulator::setSdPath(const QString &sdPath)
|
||||||
|
{
|
||||||
|
#if defined(SDCARD)
|
||||||
|
strncpy(simuSdDirectory, sdPath.toAscii().constData(), sizeof(simuSdDirectory)-1);
|
||||||
|
simuSdDirectory[sizeof(simuSdDirectory)-1] = '\0';
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void OpenTxSimulator::setVolumeGain(int value)
|
||||||
|
{
|
||||||
|
volumeGain = value;
|
||||||
|
}
|
||||||
|
|
||||||
bool OpenTxSimulator::timer10ms()
|
bool OpenTxSimulator::timer10ms()
|
||||||
{
|
{
|
||||||
#define TIMER10MS_IMPORT
|
#define TIMER10MS_IMPORT
|
||||||
@@ -357,19 +370,14 @@ bool OpenTxSimulator::lcdChanged(bool & lightEnable)
|
|||||||
#include "simulatorimport.h"
|
#include "simulatorimport.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenTxSimulator::start(QByteArray & eeprom, const Profile & profile, bool tests)
|
void OpenTxSimulator::start(QByteArray & eeprom, bool tests)
|
||||||
{
|
{
|
||||||
memcpy(NAMESPACE::eeprom, eeprom.data(), std::min<int>(sizeof(NAMESPACE::eeprom), eeprom.size()));
|
memcpy(NAMESPACE::eeprom, eeprom.data(), std::min<int>(sizeof(NAMESPACE::eeprom), eeprom.size()));
|
||||||
start((const char *)0, profile, tests);
|
start((const char *)0, tests);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenTxSimulator::start(const char * filename, const Profile & profile, bool tests)
|
void OpenTxSimulator::start(const char * filename, bool tests)
|
||||||
{
|
{
|
||||||
#if defined(SDCARD)
|
|
||||||
strncpy(simuSdDirectory, profile.sdPath().toAscii().constData(), sizeof(simuSdDirectory)-1);
|
|
||||||
simuSdDirectory[sizeof(simuSdDirectory)-1] = '\0';
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(PCBSKY9X) && !defined(REVX)
|
#if defined(PCBSKY9X) && !defined(REVX)
|
||||||
g_rotenc[0] = 0;
|
g_rotenc[0] = 0;
|
||||||
#elif defined(PCBGRUVIN9X)
|
#elif defined(PCBGRUVIN9X)
|
||||||
@@ -378,7 +386,7 @@ void OpenTxSimulator::start(const char * filename, const Profile & profile, bool
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
StartEepromThread(filename);
|
StartEepromThread(filename);
|
||||||
StartAudioThread(profile.volumeGain());
|
StartAudioThread(volumeGain);
|
||||||
StartMainThread(tests);
|
StartMainThread(tests);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -77,13 +77,20 @@ namespace NAMESPACE {
|
|||||||
|
|
||||||
class DLLEXPORT OpenTxSimulator : public SimulatorInterface {
|
class DLLEXPORT OpenTxSimulator : public SimulatorInterface {
|
||||||
|
|
||||||
|
private:
|
||||||
|
int volumeGain;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
OpenTxSimulator();
|
OpenTxSimulator();
|
||||||
|
|
||||||
virtual void start(QByteArray & eeprom, const Profile & profile, bool tests=true);
|
virtual void setSdPath(const QString &sdPath);
|
||||||
|
|
||||||
virtual void start(const char * filename, const Profile & profile, bool tests=true);
|
virtual void setVolumeGain(int value);
|
||||||
|
|
||||||
|
virtual void start(QByteArray & eeprom, bool tests=true);
|
||||||
|
|
||||||
|
virtual void start(const char * filename, bool tests=true);
|
||||||
|
|
||||||
virtual void stop();
|
virtual void stop();
|
||||||
|
|
||||||
|
|||||||
@@ -447,6 +447,8 @@ void SimulatorDialog::initUi(T * ui)
|
|||||||
windowName = tr("Simulating Radio (%1)").arg(GetCurrentFirmware()->getName());
|
windowName = tr("Simulating Radio (%1)").arg(GetCurrentFirmware()->getName());
|
||||||
setWindowTitle(windowName);
|
setWindowTitle(windowName);
|
||||||
|
|
||||||
|
simulator->setSdPath(g.profile[g.id()].sdPath());
|
||||||
|
simulator->setVolumeGain(g.profile[g.id()].volumeGain());
|
||||||
lcd->setData(simulator->getLcd(), lcdWidth, 64, lcdDepth);
|
lcd->setData(simulator->getLcd(), lcdWidth, 64, lcdDepth);
|
||||||
|
|
||||||
if (flags & SIMULATOR_FLAGS_STICK_MODE_LEFT) {
|
if (flags & SIMULATOR_FLAGS_STICK_MODE_LEFT) {
|
||||||
@@ -694,7 +696,7 @@ void SimulatorDialog::start(QByteArray & eeprom)
|
|||||||
lastPhase = -1;
|
lastPhase = -1;
|
||||||
numGvars = GetCurrentFirmware()->getCapability(Gvars);
|
numGvars = GetCurrentFirmware()->getCapability(Gvars);
|
||||||
numFlightModes = GetCurrentFirmware()->getCapability(FlightModes);
|
numFlightModes = GetCurrentFirmware()->getCapability(FlightModes);
|
||||||
simulator->start(eeprom, g.profile[g.id()], (flags & SIMULATOR_FLAGS_NOTX) ? false : true);
|
simulator->start(eeprom, (flags & SIMULATOR_FLAGS_NOTX) ? false : true);
|
||||||
getValues();
|
getValues();
|
||||||
setupTimer();
|
setupTimer();
|
||||||
}
|
}
|
||||||
@@ -704,7 +706,7 @@ void SimulatorDialog::start(const char * filename)
|
|||||||
lastPhase = -1;
|
lastPhase = -1;
|
||||||
numGvars = GetCurrentFirmware()->getCapability(Gvars);
|
numGvars = GetCurrentFirmware()->getCapability(Gvars);
|
||||||
numFlightModes = GetCurrentFirmware()->getCapability(FlightModes);
|
numFlightModes = GetCurrentFirmware()->getCapability(FlightModes);
|
||||||
simulator->start(filename, g.profile[g.id()]);
|
simulator->start(filename);
|
||||||
getValues();
|
getValues();
|
||||||
setupTimer();
|
setupTimer();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,6 @@
|
|||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "appdata.h"
|
|
||||||
|
|
||||||
#if __GNUC__
|
#if __GNUC__
|
||||||
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
|
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
|
||||||
@@ -66,9 +65,13 @@ class SimulatorInterface
|
|||||||
|
|
||||||
virtual ~SimulatorInterface() {};
|
virtual ~SimulatorInterface() {};
|
||||||
|
|
||||||
virtual void start(QByteArray &eeprom, const Profile & profile, bool tests=true) = 0;
|
virtual void setSdPath(const QString &sdPath) { };
|
||||||
|
|
||||||
virtual void start(const char *filename, const Profile & profile, bool tests=true) = 0;
|
virtual void setVolumeGain(int value) { };
|
||||||
|
|
||||||
|
virtual void start(QByteArray &eeprom, bool tests=true) = 0;
|
||||||
|
|
||||||
|
virtual void start(const char *filename, bool tests=true) = 0;
|
||||||
|
|
||||||
virtual void stop() = 0;
|
virtual void stop() = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,9 @@ int main(int argc, char *argv[])
|
|||||||
#ifdef SIMU_AUDIO
|
#ifdef SIMU_AUDIO
|
||||||
sdlFlags |= SDL_INIT_AUDIO;
|
sdlFlags |= SDL_INIT_AUDIO;
|
||||||
#endif
|
#endif
|
||||||
SDL_Init(sdlFlags);
|
if (SDL_Init(sdlFlags) < 0) {
|
||||||
|
fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SimulatorDialog *dialog;
|
SimulatorDialog *dialog;
|
||||||
|
|||||||
Reference in New Issue
Block a user