Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Simulator updated with last Kjell improvements

Browse source
This commit is contained in:
Bertrand Songis 2014-02-21 07:40:50 +01:00
parent 5842bc8473
commit 08245aade9
5 changed files with 383 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

185
companion/src/CMakeLists.txt
View file

@ -96,103 +96,103 @@ include_directories(
add_subdirectory(modeledit) add_subdirectory(modeledit)
add_subdirectory(simulation) add_subdirectory(simulation)
SET( companion_SRCS set(companion_SRCS
eeprominterface.cpp eeprominterface.cpp
hexinterface.cpp hexinterface.cpp
flashinterface.cpp flashinterface.cpp
file.cpp file.cpp
xmlinterface.cpp xmlinterface.cpp
${PROJECT_BINARY_DIR}/radio.cxx ${PROJECT_BINARY_DIR}/radio.cxx
firmwares/th9x/th9xeeprom.cpp firmwares/th9x/th9xeeprom.cpp
firmwares/th9x/th9xinterface.cpp firmwares/th9x/th9xinterface.cpp
firmwares/er9x/er9xeeprom.cpp firmwares/er9x/er9xeeprom.cpp
firmwares/er9x/er9xinterface.cpp firmwares/er9x/er9xinterface.cpp
firmwares/gruvin9x/gruvin9xeeprom.cpp firmwares/gruvin9x/gruvin9xeeprom.cpp
firmwares/gruvin9x/gruvin9xinterface.cpp firmwares/gruvin9x/gruvin9xinterface.cpp
firmwares/opentx/opentxeeprom.cpp firmwares/opentx/opentxeeprom.cpp
firmwares/opentx/open9xStockeeprom.cpp firmwares/opentx/open9xStockeeprom.cpp
firmwares/opentx/open9xGruvin9xeeprom.cpp firmwares/opentx/open9xGruvin9xeeprom.cpp
firmwares/opentx/open9xSky9xeeprom.cpp firmwares/opentx/open9xSky9xeeprom.cpp
firmwares/opentx/opentxinterface.cpp firmwares/opentx/opentxinterface.cpp
firmwares/opentx/opentxTaranisSimulator.cpp firmwares/opentx/opentxTaranisSimulator.cpp
firmwares/opentx/opentxSky9xsimulator.cpp firmwares/opentx/opentxSky9xsimulator.cpp
firmwares/opentx/opentxGruvin9xsimulator.cpp firmwares/opentx/opentxGruvin9xsimulator.cpp
firmwares/opentx/opentxM128simulator.cpp firmwares/opentx/opentxM128simulator.cpp
firmwares/opentx/opentxsimulator.cpp firmwares/opentx/opentxsimulator.cpp
firmwares/ersky9x/ersky9xeeprom.cpp firmwares/ersky9x/ersky9xeeprom.cpp
firmwares/ersky9x/ersky9xinterface.cpp firmwares/ersky9x/ersky9xinterface.cpp
${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
appdata.cpp appdata.cpp
helpers.cpp helpers.cpp
mdichild.cpp mdichild.cpp
generaledit.cpp generaledit.cpp
modelslist.cpp modelslist.cpp
mountlist.cpp mountlist.cpp
avroutputdialog.cpp avroutputdialog.cpp
apppreferencesdialog.cpp apppreferencesdialog.cpp
fwpreferencesdialog.cpp fwpreferencesdialog.cpp
burnconfigdialog.cpp burnconfigdialog.cpp
comparedialog.cpp comparedialog.cpp
contributorsdialog.cpp contributorsdialog.cpp
customizesplashdialog.cpp customizesplashdialog.cpp
burndialog.cpp burndialog.cpp
printdialog.cpp printdialog.cpp
fusesdialog.cpp fusesdialog.cpp
logsdialog.cpp logsdialog.cpp
downloaddialog.cpp downloaddialog.cpp
splashlibrary.cpp splashlibrary.cpp
mainwindow.cpp mainwindow.cpp
main.cpp companion.cpp
modelconfigdialog.cpp modelconfigdialog.cpp
qcustomplot.cpp qcustomplot.cpp
) )
SET( companion_MOC_HDRS set(companion_MOC_HDRS
avroutputdialog.h avroutputdialog.h
apppreferencesdialog.h apppreferencesdialog.h
fwpreferencesdialog.h fwpreferencesdialog.h
burnconfigdialog.h burnconfigdialog.h
comparedialog.h comparedialog.h
printdialog.h printdialog.h
fusesdialog.h fusesdialog.h
logsdialog.h logsdialog.h
contributorsdialog.h contributorsdialog.h
customizesplashdialog.h customizesplashdialog.h
splashlibrary.h splashlibrary.h
splashlabel.h splashlabel.h
burndialog.h burndialog.h
downloaddialog.h downloaddialog.h
generaledit.h generaledit.h
modelslist.h modelslist.h
mdichild.h mdichild.h
mainwindow.h mainwindow.h
modelconfigdialog.h modelconfigdialog.h
qcustomplot.h qcustomplot.h
helpers.h helpers.h
) )
SET( companion_UIS set(companion_UIS
mdichild.ui mdichild.ui
avroutputdialog.ui avroutputdialog.ui
comparedialog.ui comparedialog.ui
fusesdialog.ui fusesdialog.ui
logsdialog.ui logsdialog.ui
apppreferencesdialog.ui apppreferencesdialog.ui
fwpreferencesdialog.ui fwpreferencesdialog.ui
burnconfigdialog.ui burnconfigdialog.ui
downloaddialog.ui downloaddialog.ui
generaledit.ui generaledit.ui
printdialog.ui printdialog.ui
contributorsdialog.ui contributorsdialog.ui
customizesplashdialog.ui customizesplashdialog.ui
splashlibrary.ui splashlibrary.ui
burndialog.ui burndialog.ui
modelconfigdialog.ui modelconfigdialog.ui
) )
SET( companion_RCS set(companion_RCS
companion.qrc companion.qrc
${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
) )
MACRO (TODAY RESULT) MACRO (TODAY RESULT)
@ -316,7 +316,8 @@ set(simu_SRCS
file.cpp # TODO not needed file.cpp # TODO not needed
modeledit/node.cpp modeledit/node.cpp
modeledit/edge.cpp # TODO not needed modeledit/edge.cpp # TODO not needed
simulation/main.cpp appdata.cpp
simulator.cpp
) )
set(simu_HDRS set(simu_HDRS

5
companion/src/appdata.cpp
View file

@ -3,6 +3,9 @@
#include "appdata.h" #include "appdata.h"
// Global data and storage object
AppData g;
// ** CompStoreObj class******************** // ** CompStoreObj class********************
void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3) void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3)
{ {
@ -637,4 +640,4 @@ AppData::AppData()
getset( _id, "profileId" ,0 ); getset( _id, "profileId" ,0 );
getset( _theme, "theme" ,1 ); getset( _theme, "theme" ,1 );
getset( _warningId, "warningId" ,0 ); getset( _warningId, "warningId" ,0 );
} }

573
companion/src/appdata.h
View file

@ -21,334 +21,333 @@
class CompStoreObj class CompStoreObj
{ {
public: public:
void clear (const QString tag1="", const QString tag2="", const QString tag3=""); void clear (const QString tag1="", const QString tag2="", const QString tag3="");
void store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1="", const QString group2="" ); void store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1="", const QString group2="" );
void store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1="", const QString group2="" ); void store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1="", const QString group2="" );
void store(const QString newString, QString &string, const QString tag, const QString group1="", const QString group2="" ); void store(const QString newString, QString &string, const QString tag, const QString group1="", const QString group2="" );
void store(const bool newTruth, bool &truth, const QString tag, const QString group1="", const QString group2="" ); void store(const bool newTruth, bool &truth, const QString tag, const QString group1="", const QString group2="" );
void store(const int newNumber, int &number, const QString tag, const QString group1="", const QString group2="" ); void store(const int newNumber, int &number, const QString tag, const QString group1="", const QString group2="" );
// Retrieval functions // Retrieval functions
void retrieve( QByteArray &array, const QString tag, const QString def, const QString group1="", const QString group2="" ); void retrieve( QByteArray &array, const QString tag, const QString def, const QString group1="", const QString group2="" );
void retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1="", const QString group2="" ); void retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1="", const QString group2="" );
void retrieve( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" ); void retrieve( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" );
void retrieve( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" ); void retrieve( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" );
void retrieve( int &number, const QString tag, const int def, const QString group1="", const QString group2="" ); void retrieve( int &number, const QString tag, const int def, const QString group1="", const QString group2="" );
// Retrieve and Store functions // Retrieve and Store functions
void getset( QByteArray &array, const QString tag, const QString def, const QString group1="", const QString group2="" ); void getset( QByteArray &array, const QString tag, const QString def, const QString group1="", const QString group2="" );
void getset( QStringList &stringList, const QString tag, const QString def, const QString group1="", const QString group2="" ); void getset( QStringList &stringList, const QString tag, const QString def, const QString group1="", const QString group2="" );
void getset( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" ); void getset( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" );
void getset( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" ); void getset( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" );
void getset( int &number, const QString tag, const int def, const QString group1="", const QString group2="" ); void getset( int &number, const QString tag, const int def, const QString group1="", const QString group2="" );
}; };
class FwRevision:protected CompStoreObj class FwRevision: protected CompStoreObj
{ {
public: public:
int get( const QString); int get( const QString);
void set( const QString, const int ); void set( const QString, const int );
void remove( const QString ); void remove( const QString );
}; };
class JStickData:protected CompStoreObj class JStickData: protected CompStoreObj
{ {
private: private:
int index; int index;
int _stickAxe; int _stickAxe;
int _stickMin; int _stickMin;
int _stickMed; int _stickMed;
int _stickMax; int _stickMax;
int _stickInv; int _stickInv;
public: public:
// All the get definitions // All the get definitions
int stick_axe(); int stick_axe();
int stick_min(); int stick_min();
int stick_med(); int stick_med();
int stick_max(); int stick_max();
int stick_inv(); int stick_inv();
// All the set definitions // All the set definitions
void stick_axe(const int); void stick_axe(const int);
void stick_min(const int); void stick_min(const int);
void stick_med(const int); void stick_med(const int);
void stick_max(const int); void stick_max(const int);
void stick_inv(const int); void stick_inv(const int);
JStickData(); JStickData();
void remove(); void remove();
bool existsOnDisk(); bool existsOnDisk();
void init(int index); void init(int index);
void flush(); void flush();
}; };
class Profile:protected CompStoreObj class Profile: protected CompStoreObj
{ {
private: private:
// Class Internal Variable // Class Internal Variable
int index; int index;
// Application Variables // Application Variables
QString _firmware; QString _firmware;
QString _name; QString _name;
QString _sdPath; QString _sdPath;
QString _splashFile; QString _splashFile;
bool _burnFirmware; bool _burnFirmware;
bool _renameFwFiles; bool _renameFwFiles;
bool _patchImage; bool _patchImage;
int _channelOrder; int _channelOrder;
int _defaultMode; int _defaultMode;
// Firmware Variables // Firmware Variables
QString _beeper; QString _beeper;
QString _countryCode; QString _countryCode;
QString _display; QString _display;
QString _haptic; QString _haptic;
QString _speaker; QString _speaker;
QString _stickPotCalib; QString _stickPotCalib;
QString _trainerCalib; QString _trainerCalib;
int _currentCalib; int _currentCalib;
int _gsStickMode; int _gsStickMode;
int _ppmMultiplier; int _ppmMultiplier;
int _vBatCalib; int _vBatCalib;
int _vBatWarn; int _vBatWarn;
public: public:
// All the get definitions // All the get definitions
QString firmware(); QString firmware();
QString name(); QString name();
QString sdPath(); QString sdPath();
QString splashFile(); QString splashFile();
bool burnFirmware(); bool burnFirmware();
bool renameFwFiles(); bool renameFwFiles();
bool patchImage(); bool patchImage();
int channelOrder(); int channelOrder();
int defaultMode(); int defaultMode();
QString beeper(); QString beeper();
QString countryCode(); QString countryCode();
QString display(); QString display();
QString haptic(); QString haptic();
QString speaker(); QString speaker();
QString stickPotCalib(); QString stickPotCalib();
QString trainerCalib(); QString trainerCalib();
int currentCalib(); int currentCalib();
int gsStickMode(); int gsStickMode();
int ppmMultiplier(); int ppmMultiplier();
int vBatCalib(); int vBatCalib();
int vBatWarn(); int vBatWarn();
// All the set definitions // All the set definitions
void name (const QString); void name (const QString);
void firmware (const QString); void firmware (const QString);
void sdPath (const QString); void sdPath (const QString);
void splashFile (const QString); void splashFile (const QString);
void burnFirmware (const bool); void burnFirmware (const bool);
void renameFwFiles (const bool); void renameFwFiles (const bool);
void patchImage (const bool); void patchImage (const bool);
void channelOrder (const int); void channelOrder (const int);
void defaultMode (const int); void defaultMode (const int);
void beeper (const QString); void beeper (const QString);
void countryCode (const QString); void countryCode (const QString);
void display (const QString); void display (const QString);
void haptic (const QString); void haptic (const QString);
void speaker (const QString); void speaker (const QString);
void stickPotCalib (const QString); void stickPotCalib (const QString);
void trainerCalib (const QString); void trainerCalib (const QString);
void currentCalib (const int); void currentCalib (const int);
void gsStickMode (const int); void gsStickMode (const int);
void ppmMultiplier (const int); void ppmMultiplier (const int);
void vBatCalib (const int); void vBatCalib (const int);
void vBatWarn (const int); void vBatWarn (const int);
Profile(); Profile();
void remove(); void remove();
bool existsOnDisk(); bool existsOnDisk();
void init(int newIndex); void init(int newIndex);
void flush(); void flush();
}; };
class AppData:protected CompStoreObj class AppData: protected CompStoreObj
{ {
// All the global variables // All the global variables
public: public:
Profile profile[MAX_PROFILES]; Profile profile[MAX_PROFILES];
JStickData joystick[MAX_JOYSTICKS]; JStickData joystick[MAX_JOYSTICKS];
FwRevision fwRev; FwRevision fwRev;
private: private:
QStringList _recentFiles; QStringList _recentFiles;
QByteArray _mainWinGeo; QByteArray _mainWinGeo;
QByteArray _mainWinState; QByteArray _mainWinState;
QByteArray _modelEditGeo; QByteArray _modelEditGeo;
QString _armMcu; QString _armMcu;
QString _avrArguments; QString _avrArguments;
QString _avrPort; QString _avrPort;
QString _avrdudeLocation; QString _avrdudeLocation;
QString _compileServer; QString _compileServer;
QString _cpuId; QString _cpuId;
QString _dfuArguments; QString _dfuArguments;
QString _dfuLocation; QString _dfuLocation;
QString _lastFw; QString _lastFw;
QString _locale; QString _locale;
QString _mcu; QString _mcu;
QString _programmer; QString _programmer;
QString _sambaLocation; QString _sambaLocation;
QString _sambaPort; QString _sambaPort;
QString _backupDir; QString _backupDir;
QString _gePath; QString _gePath;
QString _eepromDir; QString _eepromDir;
QString _flashDir; QString _flashDir;
QString _imagesDir; QString _imagesDir;
QString _logDir; QString _logDir;
QString _libDir; QString _libDir;
QString _snapshotDir; QString _snapshotDir;
QString _updatesDir; QString _updatesDir;
bool _enableBackup; bool _enableBackup;
bool _backupOnFlash; bool _backupOnFlash;
bool _maximized; bool _maximized;
bool _jsSupport; bool _jsSupport;
bool _rev4aSupport; bool _rev4aSupport;
bool _showSplash; bool _showSplash;
bool _snapToClpbrd; bool _snapToClpbrd;
bool _autoCheckApp; bool _autoCheckApp;
bool _autoCheckFw; bool _autoCheckFw;
bool _simuSW; bool _simuSW;
bool _enableWizard; bool _enableWizard;
int _backLight; int _backLight;
int _embedSplashes; int _embedSplashes;
int _fwServerFails; int _fwServerFails;
int _generalEditTab; int _generalEditTab;
int _iconSize; int _iconSize;
int _jsCtrl; int _jsCtrl;
int _historySize; int _historySize;
int _modelEditTab; int _modelEditTab;
int _id; int _id;
int _theme; int _theme;
int _warningId; int _warningId;
public:
// All the get definitions
QStringList recentFiles();
QByteArray mainWinGeo();
QByteArray mainWinState();
QByteArray modelEditGeo();
public: QString armMcu();
// All the get definitions QString avrArguments();
QStringList recentFiles(); QString avrPort();
QByteArray mainWinGeo(); QString avrdudeLocation();
QByteArray mainWinState(); QString compileServer();
QByteArray modelEditGeo(); QString cpuId();
QString dfuArguments();
QString dfuLocation();
QString lastFw();
QString locale();
QString mcu();
QString programmer();
QString sambaLocation();
QString sambaPort();
QString armMcu(); QString backupDir();
QString avrArguments(); QString gePath();
QString avrPort(); QString eepromDir();
QString avrdudeLocation(); QString flashDir();
QString compileServer(); QString imagesDir();
QString cpuId(); QString logDir();
QString dfuArguments(); QString libDir();
QString dfuLocation(); QString snapshotDir();
QString lastFw(); QString updatesDir();
QString locale();
QString mcu();
QString programmer();
QString sambaLocation();
QString sambaPort();
QString backupDir(); bool enableBackup();
QString gePath(); bool backupOnFlash();
QString eepromDir(); bool jsSupport();
QString flashDir(); bool rev4aSupport();
QString imagesDir(); bool maximized();
QString logDir(); bool showSplash();
QString libDir(); bool snapToClpbrd();
QString snapshotDir(); bool autoCheckApp();
QString updatesDir(); bool autoCheckFw();
bool simuSW();
bool enableWizard();
bool enableBackup(); int backLight();
bool backupOnFlash(); int embedSplashes();
bool jsSupport(); int fwServerFails();
bool rev4aSupport(); int generalEditTab();
bool maximized(); int iconSize();
bool showSplash(); int historySize();
bool snapToClpbrd(); int jsCtrl();
bool autoCheckApp(); int modelEditTab();
bool autoCheckFw(); int id();
bool simuSW(); int theme();
bool enableWizard(); int warningId();
int backLight(); // All the set definitions
int embedSplashes(); void recentFiles (const QStringList x);
int fwServerFails(); void mainWinGeo (const QByteArray);
int generalEditTab(); void mainWinState (const QByteArray);
int iconSize(); void modelEditGeo (const QByteArray);
int historySize();
int jsCtrl();
int modelEditTab();
int id();
int theme();
int warningId();
// All the set definitions void armMcu (const QString);
void recentFiles (const QStringList x); void avrArguments (const QString);
void mainWinGeo (const QByteArray); void avrPort (const QString);
void mainWinState (const QByteArray); void avrdudeLocation (const QString);
void modelEditGeo (const QByteArray); void compileServer (const QString);
void cpuId (const QString);
void dfuArguments (const QString);
void dfuLocation (const QString);
void lastFw (const QString);
void locale (const QString);
void mcu (const QString);
void programmer (const QString);
void sambaLocation (const QString);
void sambaPort (const QString);
void armMcu (const QString); void backupDir (const QString);
void avrArguments (const QString); void gePath (const QString);
void avrPort (const QString); void eepromDir (const QString);
void avrdudeLocation (const QString); void flashDir (const QString);
void compileServer (const QString); void imagesDir (const QString);
void cpuId (const QString); void logDir (const QString);
void dfuArguments (const QString); void libDir (const QString);
void dfuLocation (const QString); void snapshotDir (const QString);
void lastFw (const QString); void updatesDir (const QString);
void locale (const QString);
void mcu (const QString);
void programmer (const QString);
void sambaLocation (const QString);
void sambaPort (const QString);
void backupDir (const QString); void enableBackup (const bool);
void gePath (const QString); void backupOnFlash (const bool);
void eepromDir (const QString); void maximized (const bool);
void flashDir (const QString); void jsSupport (const bool);
void imagesDir (const QString); void rev4aSupport (const bool);
void logDir (const QString); void showSplash (const bool);
void libDir (const QString); void snapToClpbrd (const bool);
void snapshotDir (const QString); void autoCheckApp (const bool);
void updatesDir (const QString); void autoCheckFw (const bool);
void simuSW (const bool);
void enableWizard (const bool);
void enableBackup (const bool); void backLight (const int);
void backupOnFlash (const bool); void embedSplashes (const int);
void maximized (const bool); void fwServerFails (const int);
void jsSupport (const bool); void generalEditTab (const int);
void rev4aSupport (const bool); void iconSize (const int);
void showSplash (const bool); void historySize (const int);
void snapToClpbrd (const bool); void jsCtrl (const int);
void autoCheckApp (const bool); void modelEditTab (const int);
void autoCheckFw (const bool); void id (const int);
void simuSW (const bool); void theme (const int);
void enableWizard (const bool); void warningId (const int);
void backLight (const int); // Constructor
void embedSplashes (const int); AppData();
void fwServerFails (const int);
void generalEditTab (const int);
void iconSize (const int);
void historySize (const int);
void jsCtrl (const int);
void modelEditTab (const int);
void id (const int);
void theme (const int);
void warningId (const int);
// Constructor
AppData();
}; };
extern AppData g; extern AppData g;

3
companion/src/main.cpp → companion/src/companion.cpp
View file

@ -74,9 +74,6 @@ class MyProxyStyle : public QProxyStyle
}; };
#endif #endif
// Global data and storge object
AppData g;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
Q_INIT_RESOURCE(companion); Q_INIT_RESOURCE(companion);

0
companion/src/simulation/main.cpp → companion/src/simulator.cpp
View file