diff --git a/src/xrt/include/xrt/xrt_defines.h b/src/xrt/include/xrt/xrt_defines.h index 7b1fd9a86..f5349a880 100644 --- a/src/xrt/include/xrt/xrt_defines.h +++ b/src/xrt/include/xrt/xrt_defines.h @@ -417,6 +417,14 @@ enum xrt_device_name XRT_DEVICE_VIVE_TRACKER_GEN1, XRT_DEVICE_VIVE_TRACKER_GEN2, + XRT_DEVICE_VIVE_PRO, + XRT_DEVICE_WMR_CONTROLLER, + XRT_DEVICE_XBOX_CONTROLLER, + XRT_DEVICE_GO_CONTROLLER, + XRT_DEVICE_TOUCH_CONTROLLER, + + XRT_DEVICE_HAND_INTERACTION, + XRT_DEVICE_HAND_TRACKER, }; @@ -486,7 +494,7 @@ enum xrt_input_type #define XRT_GET_INPUT_TYPE(name) ((enum xrt_input_type)(name & 0xff)) /*! - * Name of a input with a baked in type. + * Every internal input source known to monado with a baked in type. * * @see xrt_input_type * @ingroup xrt_iface @@ -536,6 +544,7 @@ enum xrt_input_name XRT_INPUT_DAYDREAM_VOLDN_CLICK = XRT_INPUT_NAME(0x0044, BOOLEAN), XRT_INPUT_DAYDREAM_TOUCHPAD = XRT_INPUT_NAME(0x0045, VEC2_MINUS_ONE_TO_ONE), XRT_INPUT_DAYDREAM_POSE = XRT_INPUT_NAME(0x0046, POSE), + XRT_INPUT_DAYDREAM_TOUCHPAD_TOUCH = XRT_INPUT_NAME(0x0047, BOOLEAN), XRT_INPUT_INDEX_SYSTEM_CLICK = XRT_INPUT_NAME(0x0050, BOOLEAN), XRT_INPUT_INDEX_SYSTEM_TOUCH = XRT_INPUT_NAME(0x0051, BOOLEAN), @@ -568,6 +577,75 @@ enum xrt_input_name XRT_INPUT_VIVE_GRIP_POSE = XRT_INPUT_NAME(0x0078, POSE), XRT_INPUT_VIVE_AIM_POSE = XRT_INPUT_NAME(0x0079, POSE), + XRT_INPUT_VIVEPRO_SYSTEM_CLICK = XRT_INPUT_NAME(0x0080, BOOLEAN), + XRT_INPUT_VIVEPRO_VOLUP_CLICK = XRT_INPUT_NAME(0x0081, BOOLEAN), + XRT_INPUT_VIVEPRO_VOLDN_CLICK = XRT_INPUT_NAME(0x0082, BOOLEAN), + XRT_INPUT_VIVEPRO_MUTE_MIC_CLICK = XRT_INPUT_NAME(0x0083, BOOLEAN), + + XRT_INPUT_WMR_MENU_CLICK = XRT_INPUT_NAME(0x0090, BOOLEAN), + XRT_INPUT_WMR_SQUEEZE_CLICK = XRT_INPUT_NAME(0x0091, BOOLEAN), + XRT_INPUT_WMR_TRIGGER_VALUE = XRT_INPUT_NAME(0x0092, VEC1_ZERO_TO_ONE), + XRT_INPUT_WMR_THUMBSTICK_CLICK = XRT_INPUT_NAME(0x0093, BOOLEAN), + XRT_INPUT_WMR_THUMBSTICK = XRT_INPUT_NAME(0x0094, VEC2_MINUS_ONE_TO_ONE), + XRT_INPUT_WMR_TRACKPAD_CLICK = XRT_INPUT_NAME(0x0095, BOOLEAN), + XRT_INPUT_WMR_TRACKPAD_TOUCH = XRT_INPUT_NAME(0x0096, BOOLEAN), + XRT_INPUT_WMR_TRACKPAD = XRT_INPUT_NAME(0x0097, VEC2_MINUS_ONE_TO_ONE), + XRT_INPUT_WMR_GRIP_POSE = XRT_INPUT_NAME(0x0098, POSE), + XRT_INPUT_WMR_AIM_POSE = XRT_INPUT_NAME(0x0099, POSE), + + XRT_INPUT_XBOX_MENU_CLICK = XRT_INPUT_NAME(0x00A0, BOOLEAN), + XRT_INPUT_XBOX_VIEW_CLICK = XRT_INPUT_NAME(0x00A1, BOOLEAN), + XRT_INPUT_XBOX_A_CLICK = XRT_INPUT_NAME(0x00A2, BOOLEAN), + XRT_INPUT_XBOX_B_CLICK = XRT_INPUT_NAME(0x00A3, BOOLEAN), + XRT_INPUT_XBOX_X_CLICK = XRT_INPUT_NAME(0x00A4, BOOLEAN), + XRT_INPUT_XBOX_Y_CLICK = XRT_INPUT_NAME(0x00A5, BOOLEAN), + XRT_INPUT_XBOX_DPAD_DOWN_CLICK = XRT_INPUT_NAME(0x00A6, BOOLEAN), + XRT_INPUT_XBOX_DPAD_RIGHT_CLICK = XRT_INPUT_NAME(0x00A7, BOOLEAN), + XRT_INPUT_XBOX_DPAD_UP_CLICK = XRT_INPUT_NAME(0x00A8, BOOLEAN), + XRT_INPUT_XBOX_DPAD_LEFT_CLICK = XRT_INPUT_NAME(0x00A9, BOOLEAN), + XRT_INPUT_XBOX_SHOULDER_LEFT_CLICK = XRT_INPUT_NAME(0x00AA, BOOLEAN), + XRT_INPUT_XBOX_SHOULDER_RIGHT_CLICK = XRT_INPUT_NAME(0x00AB, BOOLEAN), + XRT_INPUT_XBOX_THUMBSTICK_LEFT_CLICK = XRT_INPUT_NAME(0x00AC, BOOLEAN), + XRT_INPUT_XBOX_THUMBSTICK_LEFT = XRT_INPUT_NAME(0x00AD, VEC2_MINUS_ONE_TO_ONE), + XRT_INPUT_XBOX_THUMBSTICK_RIGHT_CLICK = XRT_INPUT_NAME(0x00AE, BOOLEAN), + XRT_INPUT_XBOX_THUMBSTICK_RIGHT = XRT_INPUT_NAME(0x00AF, VEC2_MINUS_ONE_TO_ONE), + XRT_INPUT_XBOX_LEFT_TRIGGER_VALUE = XRT_INPUT_NAME(0x00B0, VEC1_ZERO_TO_ONE), + XRT_INPUT_XBOX_RIGHT_TRIGGER_VALUE = XRT_INPUT_NAME(0x00B1, VEC1_ZERO_TO_ONE), + + XRT_INPUT_GO_SYSTEM_CLICK = XRT_INPUT_NAME(0x00B0, BOOLEAN), + XRT_INPUT_GO_TRIGGER_CLICK = XRT_INPUT_NAME(0x00B1, BOOLEAN), + XRT_INPUT_GO_BACK_CLICK = XRT_INPUT_NAME(0x00B2, BOOLEAN), + XRT_INPUT_GO_TRACKPAD_CLICK = XRT_INPUT_NAME(0x00B3, BOOLEAN), + XRT_INPUT_GO_TRACKPAD_TOUCH = XRT_INPUT_NAME(0x00B4, BOOLEAN), + XRT_INPUT_GO_TRACKPAD = XRT_INPUT_NAME(0x00B5, VEC2_MINUS_ONE_TO_ONE), + XRT_INPUT_GO_GRIP_POSE = XRT_INPUT_NAME(0x00B6, POSE), + XRT_INPUT_GO_AIM_POSE = XRT_INPUT_NAME(0x00B7, POSE), + + XRT_INPUT_TOUCH_X_CLICK = XRT_INPUT_NAME(0x00C0, BOOLEAN), + XRT_INPUT_TOUCH_X_TOUCH = XRT_INPUT_NAME(0x00C1, BOOLEAN), + XRT_INPUT_TOUCH_Y_CLICK = XRT_INPUT_NAME(0x00C2, BOOLEAN), + XRT_INPUT_TOUCH_Y_TOUCH = XRT_INPUT_NAME(0x00C3, BOOLEAN), + XRT_INPUT_TOUCH_MENU_CLICK = XRT_INPUT_NAME(0x00C4, BOOLEAN), + XRT_INPUT_TOUCH_A_CLICK = XRT_INPUT_NAME(0x00C5, BOOLEAN), + XRT_INPUT_TOUCH_A_TOUCH = XRT_INPUT_NAME(0x00C6, BOOLEAN), + XRT_INPUT_TOUCH_B_CLICK = XRT_INPUT_NAME(0x00C7, BOOLEAN), + XRT_INPUT_TOUCH_B_TOUCH = XRT_INPUT_NAME(0x00C8, BOOLEAN), + XRT_INPUT_TOUCH_SYSTEM_CLICK = XRT_INPUT_NAME(0x00C9, BOOLEAN), + XRT_INPUT_TOUCH_SQUEEZE_VALUE = XRT_INPUT_NAME(0x00CA, VEC1_ZERO_TO_ONE), + XRT_INPUT_TOUCH_TRIGGER_TOUCH = XRT_INPUT_NAME(0x00CB, BOOLEAN), + XRT_INPUT_TOUCH_TRIGGER_VALUE = XRT_INPUT_NAME(0x00CC, VEC1_ZERO_TO_ONE), + XRT_INPUT_TOUCH_THUMBSTICK_CLICK = XRT_INPUT_NAME(0x00CD, BOOLEAN), + XRT_INPUT_TOUCH_THUMBSTICK_TOUCH = XRT_INPUT_NAME(0x00CE, BOOLEAN), + XRT_INPUT_TOUCH_THUMBSTICK = XRT_INPUT_NAME(0x00CF, VEC2_MINUS_ONE_TO_ONE), + XRT_INPUT_TOUCH_THUMBREST_TOUCH = XRT_INPUT_NAME(0x00D0, BOOLEAN), + XRT_INPUT_TOUCH_GRIP_POSE = XRT_INPUT_NAME(0x00D1, POSE), + XRT_INPUT_TOUCH_AIM_POSE = XRT_INPUT_NAME(0x00D2, POSE), + + XRT_INPUT_HAND_SELECT_VALUE = XRT_INPUT_NAME(0x00E0, VEC1_ZERO_TO_ONE), + XRT_INPUT_HAND_SQUEEZE_VALUE = XRT_INPUT_NAME(0x00E1, VEC1_ZERO_TO_ONE), + XRT_INPUT_HAND_GRIP_POSE = XRT_INPUT_NAME(0x00E2, POSE), + XRT_INPUT_HAND_AIM_POSE = XRT_INPUT_NAME(0x00E3, POSE), + // clang-format on }; @@ -712,6 +790,15 @@ enum xrt_output_name XRT_OUTPUT_NAME_PSMV_RUMBLE_VIBRATION = XRT_OUTPUT_NAME(0x0020, VIBRATION), XRT_OUTPUT_NAME_INDEX_HAPTIC = XRT_OUTPUT_NAME(0x0030, VIBRATION), XRT_OUTPUT_NAME_VIVE_HAPTIC = XRT_OUTPUT_NAME(0x0040, VIBRATION), + XRT_OUTPUT_NAME_WMR_HAPTIC = XRT_OUTPUT_NAME(0x0050, VIBRATION), + + XRT_OUTPUT_NAME_XBOX_HAPTIC_LEFT = XRT_OUTPUT_NAME(0x0060, VIBRATION), + XRT_OUTPUT_NAME_XBOX_HAPTIC_RIGHTT = XRT_OUTPUT_NAME(0x0061, VIBRATION), + XRT_OUTPUT_NAME_XBOX_HAPTIC_LEFT_TRIGGER = XRT_OUTPUT_NAME(0x0062, VIBRATION), + XRT_OUTPUT_NAME_XBOX_HAPTIC_RIGHT_TRIGGER = XRT_OUTPUT_NAME(0x0063, VIBRATION), + + XRT_OUTPUT_NAME_TOUCH_HAPTIC = XRT_OUTPUT_NAME(0x0070, VIBRATION), + // clang-format on };