The open source OpenXR runtime
d/wmr: Add touch controller bindings for Reverb G2 controllers
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2441>
authored by
Beyley Cardellio
and committed by
Marge Bot
ce69d750
3e2eb908
+34
-1
+34
-1
src/xrt/drivers/wmr/wmr_controller_hp.c
+34
-1
src/xrt/drivers/wmr/wmr_controller_hp.c
···
65
65
*
66
66
*/
67
67
68
+
static struct xrt_binding_input_pair touch_inputs[19] = {
69
+
{XRT_INPUT_TOUCH_X_CLICK, XRT_INPUT_G2_CONTROLLER_X_CLICK},
70
+
{XRT_INPUT_TOUCH_X_TOUCH, XRT_INPUT_G2_CONTROLLER_X_CLICK},
71
+
{XRT_INPUT_TOUCH_Y_CLICK, XRT_INPUT_G2_CONTROLLER_Y_CLICK},
72
+
{XRT_INPUT_TOUCH_Y_TOUCH, XRT_INPUT_G2_CONTROLLER_Y_CLICK},
73
+
{XRT_INPUT_TOUCH_MENU_CLICK, XRT_INPUT_G2_CONTROLLER_MENU_CLICK},
74
+
{XRT_INPUT_TOUCH_MENU_CLICK, XRT_INPUT_G2_CONTROLLER_HOME_CLICK},
75
+
{XRT_INPUT_TOUCH_A_CLICK, XRT_INPUT_G2_CONTROLLER_A_CLICK},
76
+
{XRT_INPUT_TOUCH_A_TOUCH, XRT_INPUT_G2_CONTROLLER_A_CLICK},
77
+
{XRT_INPUT_TOUCH_B_CLICK, XRT_INPUT_G2_CONTROLLER_B_CLICK},
78
+
{XRT_INPUT_TOUCH_B_TOUCH, XRT_INPUT_G2_CONTROLLER_B_CLICK},
79
+
{XRT_INPUT_TOUCH_SYSTEM_CLICK, XRT_INPUT_G2_CONTROLLER_MENU_CLICK},
80
+
{XRT_INPUT_TOUCH_SYSTEM_CLICK, XRT_INPUT_G2_CONTROLLER_HOME_CLICK},
81
+
{XRT_INPUT_TOUCH_SQUEEZE_VALUE, XRT_INPUT_G2_CONTROLLER_SQUEEZE_VALUE},
82
+
{XRT_INPUT_TOUCH_TRIGGER_TOUCH, XRT_INPUT_G2_CONTROLLER_TRIGGER_VALUE},
83
+
{XRT_INPUT_TOUCH_TRIGGER_VALUE, XRT_INPUT_G2_CONTROLLER_TRIGGER_VALUE},
84
+
{XRT_INPUT_TOUCH_THUMBSTICK_CLICK, XRT_INPUT_G2_CONTROLLER_THUMBSTICK_CLICK},
85
+
{XRT_INPUT_TOUCH_THUMBSTICK, XRT_INPUT_G2_CONTROLLER_THUMBSTICK},
86
+
{XRT_INPUT_TOUCH_GRIP_POSE, XRT_INPUT_G2_CONTROLLER_GRIP_POSE},
87
+
{XRT_INPUT_TOUCH_AIM_POSE, XRT_INPUT_G2_CONTROLLER_AIM_POSE},
88
+
};
89
+
90
+
static struct xrt_binding_output_pair touch_outputs[1] = {
91
+
{XRT_OUTPUT_NAME_TOUCH_HAPTIC, XRT_OUTPUT_NAME_G2_CONTROLLER_HAPTIC},
92
+
};
93
+
68
94
static struct xrt_binding_input_pair simple_inputs[4] = {
69
95
{XRT_INPUT_SIMPLE_SELECT_CLICK, XRT_INPUT_G2_CONTROLLER_TRIGGER_VALUE},
70
96
{XRT_INPUT_SIMPLE_MENU_CLICK, XRT_INPUT_G2_CONTROLLER_MENU_CLICK},
···
76
102
{XRT_OUTPUT_NAME_SIMPLE_VIBRATION, XRT_OUTPUT_NAME_G2_CONTROLLER_HAPTIC},
77
103
};
78
104
79
-
static struct xrt_binding_profile binding_profiles[1] = {
105
+
static struct xrt_binding_profile binding_profiles[2] = {
106
+
{
107
+
.name = XRT_DEVICE_TOUCH_CONTROLLER,
108
+
.inputs = touch_inputs,
109
+
.input_count = ARRAY_SIZE(touch_inputs),
110
+
.outputs = touch_outputs,
111
+
.output_count = ARRAY_SIZE(touch_outputs),
112
+
},
80
113
{
81
114
.name = XRT_DEVICE_SIMPLE_CONTROLLER,
82
115
.inputs = simple_inputs,