[Simulator] Dyanamic Simulator virtual hardware generation and many other improvements (#4260)
* Move simulator widgets to subfolder (no code changes).
* [Simulator] Major Simulator re-structuring to reduce code redundancies and allow for fully dynamic simulated hardware setup:
SimulatorDialog is no longer sub-classed by individual radio UIs, instead a new class is added which handles just the "skin," LCD, and navigation controls (also makes setting up new models much quicker);
All radio switches/knobs/sliders are populated dynamically based on loaded hardware configuration data (eeprom/bin), including control types and names (in case of no hardware config data, reasonable "factory defaults" are loaded);
Starting Horus sim with alternate path for RADIO and MODEL data folders is now supported (.otx file is WIP);
6-way switch now works properly and various other inconsistencies addressed (eg. some Horus analogs were backwards).
* Add missing OpenTX headers to new files.
* [Simulator] Fix loading of Horus hardware settings from Companion simulation.
* Update Travis CI build environment to Qt 5.7.
* [Simulator] Fix 9X missing colored side LCD images, an #include fix, and some cleanup.
* [TravisCI] Set up for parallel Travis builds and use Qt5.7 (#4263)
* Fix starting Simulator with non-existing file/folder structure (now properly creates new ones as needed, including Horus directories with default radio/model); Temporarily remove option for using .otx file with Horus (until that feature is added).
* Load correct simulator skin for X7 when launching from Companion.
* X7 hardware defaults changed to match production hardware
* Fix minor compiler warning in mdichild.cpp, and some cleanup in eeprominterface.cpp.
* [Simulator] Centralize radio UI flavor determination.
* [Simulator] Updates:
Add X7 UI flavor;
Centralize LCD settings;
Simplify drawing curved UI widgets;
LCD color can be changed for any 1/4-bit display radio;
Slight change on default LCD "off" color;
Refactor LcdWidget to not use globals.
* [Companion] X7 EEPROM import fix
+ cosmetics
+ compilation error fixed on Manjaro
* [Companion] 9XR-PRO EEPROM import fix
+ cosmetics
+ compilation error fixed on Manjaro
* Navigation fix
French translations
* [X7] Main view cosmetics
* Fix switch/ana custom name import
* [Simulator] Add white border above/below X7 bezel, and use white-colored padding on sides; Adjust X7 default LCD color.
* Does this work? (#4269)
Read an Horus SD card produces a temporary .otx file now
* Bsongis/companion warning before automatic conversions (#4271)
* Does this work?
* Warning before automatic conversions
* Force different file name after conversion (#4272)
* Force different file name after conversion
* More detailed instructions
* [Companion] Files automatically named during XXX => Horus conversions
This commit is contained in:
committed by
Bertrand Songis
parent
b3f4870da7
commit
17a03e6c18
@@ -28,9 +28,6 @@
|
||||
#include <QMap>
|
||||
#include <algorithm>
|
||||
|
||||
// TODO can be removed?
|
||||
template<class t> t LIMIT(t mi, t x, t ma) { return std::min(std::max(mi, x), ma); }
|
||||
|
||||
struct TxInputs
|
||||
{
|
||||
int sticks[CPN_MAX_STICKS]; /* lh lv rv rh */
|
||||
@@ -38,7 +35,7 @@ struct TxInputs
|
||||
int switches[CPN_MAX_SWITCHES];
|
||||
bool keys[CPN_MAX_KEYS];
|
||||
bool rotenc;
|
||||
bool trims[12];
|
||||
bool trims[(CPN_MAX_STICKS + CPN_MAX_AUX_TRIMS) * 2];
|
||||
};
|
||||
|
||||
class TxOutputs
|
||||
@@ -62,11 +59,11 @@ class SimulatorInterface
|
||||
{
|
||||
public:
|
||||
|
||||
virtual ~SimulatorInterface() {};
|
||||
virtual ~SimulatorInterface() {}
|
||||
|
||||
virtual void setSdPath(const QString & sdPath = "", const QString & settingsPath = "") { };
|
||||
|
||||
virtual void setVolumeGain(int value) { };
|
||||
virtual void setVolumeGain(int value) { }
|
||||
|
||||
virtual void start(QByteArray & eeprom, bool tests=true) = 0;
|
||||
|
||||
@@ -89,10 +86,10 @@ class SimulatorInterface
|
||||
virtual void getTrims(Trims &trims) = 0;
|
||||
|
||||
virtual unsigned int getPhase() = 0;
|
||||
|
||||
|
||||
virtual const char * getPhaseName(unsigned int phase) = 0;
|
||||
|
||||
virtual void wheelEvent(int steps) { };
|
||||
virtual void wheelEvent(int steps) { }
|
||||
|
||||
virtual const char * getError() = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user