feat: New advanced joystick mode on radio, improvements to Companion and Simulator joystick support (#3111)
* Allow switches on the connected radio to control switches in the simulator via the joystick interface. * Merge configurable radio joystick interface from banyaszg. * Add two more 'axis' channels to companion. * Fix 6POS from USB joystick to simulator. * Reduce data size. * Fix build error on B&W radios. * Add 'Companion' button mode to work with the button logic in the Companion app. * Build Companion joystick setup layout at runtime. Change #define names for simulator joystick. Allow 15 axes and 32 buttons. Initial support for trim sliders. * Remove custom joystick button type for companion - use 3 buttons per switch in companion to control simulator switch state. * Fix joystick constructor calls parameters. Connect some radio joystick trims to simulator widgets. * Restore 'companion' button type to reduce number of buttons needed. Make trims work via buttons in USB joystick. * Connect joystick trim buttons to simulator widgets. * Use companion source names for trims. * Add encode / decode of usb joystick custom settings to Companion. * Convert to lvgl layouts. Update language files. * Fix generated YAML storage files. * Fix initialisation error when editing button channel. Cleanup code. * Fix rebase. * Fix refresh of joystick channel list view after editing an entry. Companion joystick config window uses two columns. * Fix vertical joystick inversion bug. Change stick axis labels. --------- Co-authored-by: Phil Mitchell <phil.a.mitchell@gmail.com>
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#ifndef _SIMULATORWIDGET_H_
|
||||
#define _SIMULATORWIDGET_H_
|
||||
|
||||
#include "appdata.h"
|
||||
#include "constants.h"
|
||||
#include "helpers.h"
|
||||
#include "radiodata.h"
|
||||
@@ -88,6 +89,7 @@ class SimulatorWidget : public QWidget
|
||||
void stickValueChange(int axis, int value);
|
||||
void stickModeChange(const unsigned mode);
|
||||
void widgetValueChange(const RadioWidget::RadioWidgetType type, const int index, const int value);
|
||||
void widgetValueAdjust(const RadioWidget::RadioWidgetType type, const int index, const int offset, const bool state);
|
||||
void widgetStateChange(const RadioWidget::RadioWidgetState & state);
|
||||
void inputValueChange(int type, quint8 index, qint16 value);
|
||||
void simulatorSetData(const QByteArray & data);
|
||||
@@ -110,6 +112,7 @@ class SimulatorWidget : public QWidget
|
||||
void onSimulatorError(const QString & error);
|
||||
void onRadioWidgetValueChange(const RadioWidget::RadioWidgetType type, const int index, int value);
|
||||
void onjoystickAxisValueChanged(int axis, int value);
|
||||
void onjoystickButtonValueChanged(int button, bool state);
|
||||
|
||||
void setRadioProfileId(int value);
|
||||
void setupRadioWidgets();
|
||||
@@ -145,6 +148,7 @@ class SimulatorWidget : public QWidget
|
||||
|
||||
#ifdef JOYSTICKS
|
||||
Joystick * joystick = nullptr;
|
||||
int switchDirection[MAX_JS_BUTTONS];
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user