mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xrt: It's a cross not a x

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-09-03 15:24:58 +01:00
parent 93ccced80b
commit a0f2793457
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrt/drivers/psmv/psmv_driver.c
View file

@ -65,7 +65,7 @@ enum psmv_input_index
PSMV_INDEX_START_CLICK,
PSMV_INDEX_SELECT_CLICK,
PSMV_INDEX_SQUARE_CLICK,
PSMV_INDEX_X_CLICK,
PSMV_INDEX_CROSS_CLICK,
PSMV_INDEX_CIRCLE_CLICK,
PSMV_INDEX_TRIANGLE_CLICK,
PSMV_INDEX_TRIGGER_VALUE,
@ -88,7 +88,7 @@ enum psmv_button_bit
PSMV_BUTTON_BIT_TRIANGLE = (1 << 20),
PSMV_BUTTON_BIT_CIRCLE = (1 << 21),
PSMV_BUTTON_BIT_SQUARE = (1 << 22),
PSMV_BUTTON_BIT_X = (1 << 23),
PSMV_BUTTON_BIT_CROSS = (1 << 23),
PSMV_BUTTON_BIT_START = (1 << 27),
PSMV_BUTTON_BIT_SELECT = (1 << 24),
@ -401,7 +401,7 @@ psmv_device_update_inputs(struct xrt_device *xdev,
psmv_update_input_click(psmv, PSMV_INDEX_START_CLICK, now, PSMV_BUTTON_BIT_START);
psmv_update_input_click(psmv, PSMV_INDEX_SELECT_CLICK, now, PSMV_BUTTON_BIT_SELECT);
psmv_update_input_click(psmv, PSMV_INDEX_SQUARE_CLICK, now, PSMV_BUTTON_BIT_SQUARE);
psmv_update_input_click(psmv, PSMV_INDEX_X_CLICK, now, PSMV_BUTTON_BIT_X);
psmv_update_input_click(psmv, PSMV_INDEX_CROSS_CLICK, now, PSMV_BUTTON_BIT_CROSS);
psmv_update_input_click(psmv, PSMV_INDEX_CIRCLE_CLICK, now, PSMV_BUTTON_BIT_CIRCLE);
psmv_update_input_click(psmv, PSMV_INDEX_TRIANGLE_CLICK, now, PSMV_BUTTON_BIT_TRIANGLE);
psmv_update_trigger_value(psmv, PSMV_INDEX_TRIGGER_VALUE, now);
@ -485,7 +485,7 @@ psmv_found(struct xrt_prober *xp,
SET_INPUT(START_CLICK);
SET_INPUT(SELECT_CLICK);
SET_INPUT(SQUARE_CLICK);
SET_INPUT(X_CLICK);
SET_INPUT(CROSS_CLICK);
SET_INPUT(CIRCLE_CLICK);
SET_INPUT(TRIANGLE_CLICK);
SET_INPUT(TRIGGER_VALUE);

2
src/xrt/include/xrt/xrt_defines.h
View file

@ -339,7 +339,7 @@ enum xrt_input_name
XRT_INPUT_PSMV_START_CLICK = XRT_INPUT_NAME(0x0022, BOOLEAN),
XRT_INPUT_PSMV_SELECT_CLICK = XRT_INPUT_NAME(0x0023, BOOLEAN),
XRT_INPUT_PSMV_SQUARE_CLICK = XRT_INPUT_NAME(0x0024, BOOLEAN),
XRT_INPUT_PSMV_X_CLICK = XRT_INPUT_NAME(0x0025, BOOLEAN),
XRT_INPUT_PSMV_CROSS_CLICK = XRT_INPUT_NAME(0x0025, BOOLEAN),
XRT_INPUT_PSMV_CIRCLE_CLICK = XRT_INPUT_NAME(0x0026, BOOLEAN),
XRT_INPUT_PSMV_TRIANGLE_CLICK = XRT_INPUT_NAME(0x0027, BOOLEAN),
XRT_INPUT_PSMV_TRIGGER_VALUE = XRT_INPUT_NAME(0x0028, VEC1_ZERO_TO_ONE),