[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:
committed by
Bertrand Songis
parent
36bb951314
commit
57dc0159d6
@@ -24,32 +24,40 @@
|
||||
#include "helpers.h"
|
||||
#include "virtualjoystickwidget.h"
|
||||
|
||||
#define TRAINERSIMU_HEARTBEAT_PERIOD 500 // [ms]
|
||||
|
||||
TrainerSimulator::TrainerSimulator(QWidget * parent, SimulatorInterface * simulator):
|
||||
QWidget(parent),
|
||||
ui(new Ui::TrainerSimulator),
|
||||
simulator(simulator)
|
||||
simulator(simulator),
|
||||
m_simuStarted(false)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
vJoyLeft = new VirtualJoystickWidget(this, 'L', false);
|
||||
vJoyLeft->setStickColor(Qt::cyan);
|
||||
vJoyLeft->setStickScale(512);
|
||||
ui->leftStickLayout->addWidget(vJoyLeft);
|
||||
|
||||
vJoyRight = new VirtualJoystickWidget(this, 'R', false);
|
||||
vJoyRight->setStickColor(Qt::cyan);
|
||||
vJoyRight->setStickScale(512);
|
||||
ui->rightStickLayout->addWidget(vJoyRight);
|
||||
|
||||
timer = new QTimer(this);
|
||||
timer->setInterval(10);
|
||||
connect(timer, SIGNAL(timeout()), this, SLOT(onTimerEvent()));
|
||||
connect(vJoyLeft, &VirtualJoystickWidget::valueChange, this, &TrainerSimulator::onRadioWidgetValueChange);
|
||||
connect(vJoyRight, &VirtualJoystickWidget::valueChange, this, &TrainerSimulator::onRadioWidgetValueChange);
|
||||
|
||||
connect(this, &TrainerSimulator::trainerHeartbeat, simulator, &SimulatorInterface::setTrainerTimeout);
|
||||
connect(this, &TrainerSimulator::trainerChannelChange, simulator, &SimulatorInterface::setTrainerInput);
|
||||
connect(simulator, &SimulatorInterface::started, this, &TrainerSimulator::onSimulatorStarted);
|
||||
connect(simulator, &SimulatorInterface::stopped, this, &TrainerSimulator::onSimulatorStopped);
|
||||
|
||||
timer.setInterval(TRAINERSIMU_HEARTBEAT_PERIOD - 10);
|
||||
connect(&timer, &QTimer::timeout, this, &TrainerSimulator::emitHeartbeat);
|
||||
}
|
||||
|
||||
TrainerSimulator::~TrainerSimulator()
|
||||
{
|
||||
if (timer) {
|
||||
timer->stop();
|
||||
delete timer;
|
||||
}
|
||||
if (vJoyLeft)
|
||||
delete vJoyLeft;
|
||||
if (vJoyRight)
|
||||
@@ -60,42 +68,44 @@ TrainerSimulator::~TrainerSimulator()
|
||||
|
||||
void TrainerSimulator::showEvent(QShowEvent *event)
|
||||
{
|
||||
timer->start();
|
||||
event->accept();
|
||||
start();
|
||||
}
|
||||
|
||||
void TrainerSimulator::closeEvent(QCloseEvent *event)
|
||||
void TrainerSimulator::hideEvent(QHideEvent *event)
|
||||
{
|
||||
timer->stop();
|
||||
event->accept();
|
||||
stop();
|
||||
}
|
||||
|
||||
void TrainerSimulator::centerSticks()
|
||||
void TrainerSimulator::start()
|
||||
{
|
||||
if (vJoyLeft)
|
||||
vJoyLeft->centerStick();
|
||||
|
||||
if (vJoyRight)
|
||||
vJoyRight->centerStick();
|
||||
timer.start();
|
||||
}
|
||||
|
||||
void TrainerSimulator::onTimerEvent()
|
||||
void TrainerSimulator::stop()
|
||||
{
|
||||
centerSticks();
|
||||
setTrainerInputs();
|
||||
timer.stop();
|
||||
}
|
||||
|
||||
void TrainerSimulator::setTrainerInputs()
|
||||
void TrainerSimulator::onSimulatorStarted()
|
||||
{
|
||||
if (!simulator)
|
||||
return;
|
||||
m_simuStarted = true;
|
||||
}
|
||||
|
||||
if (vJoyLeft) {
|
||||
simulator->setTrainerInput(0, int( 512 * vJoyLeft->getStickX())); // LEFT HORZ
|
||||
simulator->setTrainerInput(1, int(-512 * vJoyLeft->getStickY())); // LEFT VERT
|
||||
}
|
||||
if (vJoyRight) {
|
||||
simulator->setTrainerInput(2, int(-512 * vJoyRight->getStickY())); // RGHT VERT
|
||||
simulator->setTrainerInput(3, int( 512 * vJoyRight->getStickX())); // RGHT HORZ
|
||||
void TrainerSimulator::onSimulatorStopped()
|
||||
{
|
||||
m_simuStarted = false;
|
||||
stop();
|
||||
}
|
||||
|
||||
void TrainerSimulator::emitHeartbeat()
|
||||
{
|
||||
emit trainerHeartbeat(TRAINERSIMU_HEARTBEAT_PERIOD);
|
||||
}
|
||||
|
||||
void TrainerSimulator::onRadioWidgetValueChange(RadioWidget::RadioWidgetType type, int index, int value)
|
||||
{
|
||||
if (type == RadioWidget::RADIO_WIDGET_STICK && m_simuStarted && timer.isActive()) {
|
||||
emit trainerChannelChange(index, value);
|
||||
emitHeartbeat();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user