[Simulator] Asynchronous SimulatorInterface & a few new features. (#4738)
* [Simulator] Create RadioKeyWidget class for UI buttons & refactor ButtonsWidget; Refactor SimulatedUIWidget (and subtypes) to use new RadioKeyWidgets/ButtonsWidget; Centralize help text for key mappings and get creative with some icons; Simplify some radio UI setups with rectangular buttons.
* [Simulator] Convert all simulator data I/O to signals/slots mechanism:
* SimulatorInterface/OpenTxSimulator:
- Now inherits from QObject to allow signal/slot interface;
- Allows data exchange on a per-item basis (eg. each I/O value is treated separately instead of sending whole arrays or structs of data);
- Checks for data changes and only emits signals when change is detected (GUI can now assume only new values are being sent);
- Manages its own 10ms timer (doesn't rely on GUI to do that);
- Sends "heartbeat" signals @ 1Hz for status monitoring;
* Simulator GUI:
- All data is exchanged between GUI elements as well as SimulatorInterface via signals/slots using standardized methods;
- Data is sent immediately, and only, when actually changed (eg. a control is moved) instead of in bulk at specific time intervals;
- Similarly, an asynchronous method is used for reading incoming data, w/out timers or loops;
- Improve VirtualJoystickWidget to be more encapsulated and configurable;
- Pause telemetry simulator if window is hidden;
* [Simulator] Move SimulatorInterface instance to separate thread, ensure safe asynchronous operations & proper timer interactions; Protect/remove some functions, & reorganize the order (cosmetics).
* [Simulator] Traces are now delivered to OpenTxSimulator and one or more QIODevice(s) can be added as recipient(s); Add SimulatorInterface::getCapability() for compile-time settings; Remove reversed POT1/SLIDER1 mixer exception (Taranis) requirement for SIMU; Fix plus/minus key delay on wheel event w/out encoder.
* [Simulator] Add current knob/slider/trim input value in tool-tips (KnobWidget and SliderWidget).
* [Simulator] Fix trims widget internal value not properly updating, and remove trim influence on virtual joystick X/Y value display (closes #4671).
* [SimulatorInterface] Add handling of transmitter input voltage, including a rough conversion of volts to ADC value for different boards, and default battery volts lookup function; Clear analogs array before starting.
* [Simulator] Add SimulatorInterface::init() method to separate pre-startup tasks; Report actual trim range, not just extended on/off; Change how radio widget states are restored; VirtualJoystickWidget: Connect trim changes directly from simulator, connect joystick events directly, report stick mode directly instead of setting values/constraints externally.
* [Simulator] Calculate default Tx V input based on configured range in radio settings (or warning V+2 for radios which don't support a range).
* [Simulator] Add functional aux. trims for Horus (closes #4699).
* [Companion] Remove problematic QMessageLogContext from AppDebugMessageHandler::messageOutput().
* [Simulator] Prevent trim change via slider if disabled for flight mode (closes #4600).
* [OpenTxSimulator] Fixes for Qt < 5.4.
* [OpenTxSimulator] Fix slot name.
This commit is contained in:
Max Paperno
committed by
Bertrand Songis
Bertrand Songis
parent
36bb951314
commit
57dc0159d6
@@ -24,24 +24,20 @@
|
||||
#include "constants.h"
|
||||
#include "helpers.h"
|
||||
#include "radiodata.h"
|
||||
#include "radiowidget.h"
|
||||
#include "simulator.h"
|
||||
#include "simulatorinterface.h"
|
||||
|
||||
#include <QElapsedTimer>
|
||||
#include <QTimer>
|
||||
#include <QWidget>
|
||||
#include <QVector>
|
||||
|
||||
#define FLASH_DURATION 10
|
||||
|
||||
#define CBEEP_ON "QLabel { background-color: #FF364E }"
|
||||
#define CBEEP_OFF "QLabel { }"
|
||||
|
||||
void traceCb(const char * text);
|
||||
|
||||
class Firmware;
|
||||
class SimulatorInterface;
|
||||
class SimulatedUIWidget;
|
||||
class RadioWidget;
|
||||
class RadioSwitchWidget;
|
||||
class VirtualJoystickWidget;
|
||||
#ifdef JOYSTICKS
|
||||
class Joystick;
|
||||
@@ -56,8 +52,6 @@ namespace Ui {
|
||||
class SimulatorWidget;
|
||||
}
|
||||
|
||||
using namespace Simulator;
|
||||
|
||||
class SimulatorWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -84,7 +78,7 @@ class SimulatorWidget : public QWidget
|
||||
|
||||
QString getSdPath() const { return sdCardPath; }
|
||||
QString getDataPath() const { return radioDataPath; }
|
||||
QVector<keymapHelp_t> * getKeymapHelp() { return &keymapHelp; }
|
||||
QVector<Simulator::keymapHelp_t> getKeymapHelp() const { return keymapHelp; }
|
||||
|
||||
public slots:
|
||||
void start();
|
||||
@@ -92,52 +86,18 @@ class SimulatorWidget : public QWidget
|
||||
void restart();
|
||||
void shutdown();
|
||||
|
||||
private:
|
||||
void setRadioProfileId(int value);
|
||||
void setupRadioWidgets();
|
||||
void setupTimer();
|
||||
void restoreRadioWidgetsState();
|
||||
QList<QByteArray> saveRadioWidgetsState();
|
||||
|
||||
void setValues();
|
||||
void getValues();
|
||||
void setTrims();
|
||||
|
||||
|
||||
Ui::SimulatorWidget * ui;
|
||||
SimulatorInterface * simulator;
|
||||
Firmware * firmware;
|
||||
GeneralSettings radioSettings;
|
||||
|
||||
QTimer * timer;
|
||||
QString windowName;
|
||||
QVector<keymapHelp_t> keymapHelp;
|
||||
|
||||
SimulatedUIWidget * radioUiWidget;
|
||||
VirtualJoystickWidget * vJoyLeft;
|
||||
VirtualJoystickWidget * vJoyRight;
|
||||
|
||||
QVector<RadioSwitchWidget *> switches;
|
||||
QVector<RadioWidget *> analogs;
|
||||
|
||||
QString sdCardPath;
|
||||
QString radioDataPath;
|
||||
QByteArray startupData;
|
||||
Board::Type m_board;
|
||||
quint8 flags;
|
||||
int radioProfileId;
|
||||
int lastPhase;
|
||||
int buttonPressed;
|
||||
int trimPressed;
|
||||
bool startupFromFile;
|
||||
bool deleteTempRadioData;
|
||||
bool saveTempRadioData;
|
||||
bool middleButtonPressed;
|
||||
bool firstShow;
|
||||
|
||||
#ifdef JOYSTICKS
|
||||
Joystick *joystick;
|
||||
#endif
|
||||
signals:
|
||||
void stickValueChange(int axis, int value);
|
||||
void stickModeChange(const unsigned mode);
|
||||
void widgetValueChange(const RadioWidget::RadioWidgetType type, const int index, const int value);
|
||||
void widgetStateChange(const RadioWidget::RadioWidgetState & state);
|
||||
void inputValueChange(int type, quint8 index, qint16 value);
|
||||
void simulatorSetData(const QByteArray & data);
|
||||
void simulatorInit();
|
||||
void simulatorStart(const char * filename, bool tests);
|
||||
void simulatorStop();
|
||||
void simulatorSdPathChange(const QString & sdPath, const QString & dataPath);
|
||||
void simulatorVolumeGainChange(const int gain);
|
||||
|
||||
private slots:
|
||||
virtual void mousePressEvent(QMouseEvent *event);
|
||||
@@ -145,12 +105,50 @@ class SimulatorWidget : public QWidget
|
||||
virtual void wheelEvent(QWheelEvent *event);
|
||||
|
||||
void onTimerEvent();
|
||||
void onTrimPressed(int index);
|
||||
void onTrimReleased(int);
|
||||
void onTrimSliderMoved(int index, int value);
|
||||
void centerSticks();
|
||||
void onSimulatorStarted();
|
||||
void onSimulatorStopped();
|
||||
void onSimulatorHeartbeat(qint32 loops, qint64 timestamp);
|
||||
void onPhaseChanged(qint32 phase, const QString & name);
|
||||
void onSimulatorError(const QString & error);
|
||||
void onRadioWidgetValueChange(const RadioWidget::RadioWidgetType type, const int index, int value);
|
||||
void onjoystickAxisValueChanged(int axis, int value);
|
||||
|
||||
void setRadioProfileId(int value);
|
||||
void setupRadioWidgets();
|
||||
void restoreRadioWidgetsState();
|
||||
|
||||
private:
|
||||
void saveRadioWidgetsState(QList<QByteArray> & state);
|
||||
|
||||
Ui::SimulatorWidget * ui;
|
||||
SimulatorInterface * simulator;
|
||||
Firmware * firmware;
|
||||
GeneralSettings radioSettings;
|
||||
|
||||
QTimer m_timer;
|
||||
QString windowName;
|
||||
QVector<Simulator::keymapHelp_t> keymapHelp;
|
||||
QElapsedTimer m_heartbeatTimer;
|
||||
|
||||
SimulatedUIWidget * radioUiWidget;
|
||||
VirtualJoystickWidget * vJoyLeft;
|
||||
VirtualJoystickWidget * vJoyRight;
|
||||
QVector<RadioWidget *> m_radioWidgets;
|
||||
|
||||
QString sdCardPath;
|
||||
QString radioDataPath;
|
||||
QByteArray startupData;
|
||||
Board::Type m_board;
|
||||
quint8 flags;
|
||||
int radioProfileId;
|
||||
bool startupFromFile;
|
||||
bool deleteTempRadioData;
|
||||
bool saveTempRadioData;
|
||||
|
||||
#ifdef JOYSTICKS
|
||||
Joystick *joystick;
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
#endif // _SIMULATORWIDGET_H_
|
||||
|
||||
Reference in New Issue
Block a user