[Simulator] Further Simulator improvements. (#4282)
* Refactor CompStoreObj to use templates. Clean up some formatting.
* [Simulator] Add SimulatorOptions type to replace individual simulator options; Fix storage handler for custom types; Cleanup some redundant code.
* [Simulator][Joystick] Rework the joystick options/calibration dialog. Can now enable/disable/select the Joystick from there. Delay start of calibration until Start is pressed (otherwise looks like last calibration didn't work). And generally refactor a lot of it to be smarter.
* Cosmetics.
* [Simulator] Add state handling for RadioWidget class. Split code to cpp file.
* [Simulator] Add SimulatorStartupDialog as its own UI class.
* [Simulator] Multiple changes and new features:
All Horus data source options are now fully supported with data properly saved after use (SD path, .otx file, or custom data path);
Loading .otx files now works for all radio types (but not saving data back to .otx);
Switch and knob/slider states are now saved to per radio profile;
Joystick configuration/calibration is now available directly from inside Simulator;
Due to refactoring, all previously saved per-profile simulator settings are now invalid;
Further consolidated simulator dialog startup/shutdown, now handles temp. paths internally, etc;
With WIN_USE_CONSOLE defined, Simulator and Companion when started from Windows command line will now use that console for all messages (instead of opening a new one). This allows full debug output to be seen at all stages of execution and after exit.
* [Simulator] Fix build w/out SDL Joystick support.
* [Simulator] Fix bogus throttle warning on simulator start; Add forgotten RadioWidgetState flags to stream handlers; Add debug state saver in SimulatorOptions.
This commit is contained in:
committed by
Bertrand Songis
parent
b53ec7392c
commit
6e2474081f
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Copyright (C) OpenTX
|
||||
*
|
||||
* Based on code named
|
||||
* th9x - http://code.google.com/p/th9x
|
||||
* er9x - http://code.google.com/p/er9x
|
||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||
*
|
||||
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef SIMULATOR_H
|
||||
#define SIMULATOR_H
|
||||
|
||||
#include <QColor>
|
||||
#include <QDataStream>
|
||||
#include <QDebug>
|
||||
#include <QPair>
|
||||
#include <QString>
|
||||
|
||||
#define SIMULATOR_OPTIONS_VERSION 1
|
||||
|
||||
namespace Simulator {
|
||||
|
||||
typedef QPair<QString, QString> keymapHelp_t;
|
||||
|
||||
}
|
||||
|
||||
struct SimulatorOptions
|
||||
{
|
||||
enum StartupDataTypes {
|
||||
START_WITH_FILE = 0,
|
||||
START_WITH_FOLDER,
|
||||
START_WITH_SDPATH,
|
||||
START_WITH_RAWDATA
|
||||
};
|
||||
|
||||
private:
|
||||
quint16 _version = SIMULATOR_OPTIONS_VERSION; // structure definition version
|
||||
|
||||
public:
|
||||
// v1 fields
|
||||
quint8 startupDataType = START_WITH_FILE;
|
||||
QString firmwareId;
|
||||
QString dataFile;
|
||||
QString dataFolder;
|
||||
QString sdPath;
|
||||
QByteArray windowGeometry;
|
||||
QList<QByteArray> controlsState; // saved switch/pot/stick settings
|
||||
QColor lcdColor;
|
||||
|
||||
friend QDataStream & operator << (QDataStream &out, const SimulatorOptions & o)
|
||||
{
|
||||
out << o._version << o.startupDataType << o.firmwareId << o.dataFile << o.dataFolder
|
||||
<< o.sdPath << o.windowGeometry << o.controlsState << o.lcdColor;
|
||||
return out;
|
||||
}
|
||||
|
||||
friend QDataStream & operator >> (QDataStream &in, SimulatorOptions & o)
|
||||
{
|
||||
if (o._version <= SIMULATOR_OPTIONS_VERSION) {
|
||||
in >> o._version >> o.startupDataType >> o.firmwareId >> o.dataFile >> o.dataFolder
|
||||
>> o.sdPath >> o.windowGeometry >> o.controlsState >> o.lcdColor;
|
||||
}
|
||||
return in;
|
||||
}
|
||||
|
||||
friend QDebug operator << (QDebug d, const SimulatorOptions & o)
|
||||
{
|
||||
QDebugStateSaver saver(d);
|
||||
d.nospace() << "SimulatorOptions: firmwareId=" << o.firmwareId << "; dataFile=" << o.dataFile << "; dataFolder=" << o.dataFolder
|
||||
<< "; sdPath=" << o.sdPath << "; startupDataType=" << o.startupDataType;
|
||||
return d;
|
||||
}
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(SimulatorOptions)
|
||||
|
||||
|
||||
#endif // SIMULATOR_H
|
||||
Reference in New Issue
Block a user