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:
@@ -29,6 +29,7 @@
|
||||
#include "opentx_types.h"
|
||||
#include "globals.h"
|
||||
#include "serial.h"
|
||||
#include "usb_joystick.h"
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
#define N_TARANIS_FIELD(x)
|
||||
@@ -624,6 +625,36 @@ PACK(struct PartialModel {
|
||||
TimerData timers[MAX_TIMERS];
|
||||
});
|
||||
|
||||
/*
|
||||
* USB Joystick channel structure
|
||||
*/
|
||||
|
||||
PACK(struct USBJoystickChData {
|
||||
uint8_t mode:3 ENUM(USBJoystickCh);
|
||||
uint8_t inversion:1;
|
||||
uint8_t param:4;
|
||||
uint8_t btn_num:5;
|
||||
uint8_t switch_npos:3;
|
||||
|
||||
#if defined(USBJ_EX)
|
||||
NOBACKUP(
|
||||
uint8_t lastBtnNumNoCLip() {
|
||||
uint8_t last = btn_num + switch_npos;
|
||||
// Use one less joystick button for 2POS and 3POS switches for Companion mode
|
||||
if ((param == USBJOYS_BTN_MODE_COMPANION) && (switch_npos > 0) && (switch_npos < 3)) last -= 1;
|
||||
return last;
|
||||
}
|
||||
uint8_t lastBtnNum() {
|
||||
uint8_t last = lastBtnNumNoCLip();
|
||||
if (last >= USBJ_BUTTON_SIZE) {
|
||||
last = USBJ_BUTTON_SIZE - 1;
|
||||
}
|
||||
return last;
|
||||
}
|
||||
);
|
||||
#endif
|
||||
});
|
||||
|
||||
PACK(struct ModelData {
|
||||
CUST_ATTR(semver,nullptr,w_semver);
|
||||
ModelHeader header;
|
||||
@@ -725,6 +756,11 @@ PACK(struct ModelData {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t usbJoystickExtMode:1;
|
||||
uint8_t usbJoystickIfMode:3 ENUM(USBJoystickIfMode);
|
||||
uint8_t usbJoystickCircularCut:4;
|
||||
USBJoystickChData usbJoystickCh[USBJ_MAX_JOYSTICK_CHANNELS];
|
||||
});
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user