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

d/dd: Make touchpad a single input

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-05-01 19:19:19 +01:00 committed by Jakob Bornecrantz
parent d62c2d2011
commit c582bde17a
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/xrt/drivers/arduino/arduino_device.c
View file

@ -395,8 +395,7 @@ arduino_device_create(struct os_ble_device *ble,
ad->base.inputs[3].name = XRT_INPUT_DAYDREAM_CIRCLE_CLICK;
ad->base.inputs[4].name = XRT_INPUT_DAYDREAM_VOLDN_CLICK;
ad->base.inputs[5].name = XRT_INPUT_DAYDREAM_VOLUP_CLICK;
ad->base.inputs[6].name = XRT_INPUT_DAYDREAM_TOUCHPAD_VALUE_X;
ad->base.inputs[7].name = XRT_INPUT_DAYDREAM_TOUCHPAD_VALUE_Y;
ad->base.inputs[6].name = XRT_INPUT_DAYDREAM_TOUCHPAD;
ad->ble = ble;
ad->print_spew = print_spew;

21
src/xrt/drivers/daydream/daydream_device.c
View file

@ -40,8 +40,7 @@ enum daydream_input_index
DAYDREAM_CIRCLE_CLICK,
DAYDREAM_VOLUP_CLICK,
DAYDREAM_VOLDN_CLICK,
DAYDREAM_TOUCHPAD_POSX,
DAYDREAM_TOUCHPAD_POSY,
DAYDREAM_TOUCHPAD,
};
@ -303,10 +302,17 @@ daydream_device_update_inputs(struct xrt_device *xdev)
daydream_update_input_click(daydream, 5, now, DAYDREAM_VOLUP_BUTTON_MASK);
// clang-format on
daydream->base.inputs[6].timestamp = now;
daydream->base.inputs[6].value.vec1.x = daydream->last.touchpad.x;
daydream->base.inputs[7].timestamp = now;
daydream->base.inputs[7].value.vec1.x = daydream->last.touchpad.y;
daydream->base.inputs[DAYDREAM_TOUCHPAD].timestamp = now;
float x = (daydream->last.touchpad.y / 255.0) * 2.0 - 1.0;
float y = (daydream->last.touchpad.y / 255.0) * 2.0 - 1.0;
// Device sets x and y to zero when no finger is detected on the pad.
if (daydream->last.touchpad.x == 0 || daydream->last.touchpad.y == 0) {
x = y = 0.0f;
}
daydream->base.inputs[DAYDREAM_TOUCHPAD].value.vec2.x = x;
daydream->base.inputs[DAYDREAM_TOUCHPAD].value.vec2.y = y;
// Done now.
@ -355,8 +361,7 @@ daydream_device_create(struct os_ble_device *ble,
dd->base.inputs[3].name = XRT_INPUT_DAYDREAM_CIRCLE_CLICK;
dd->base.inputs[4].name = XRT_INPUT_DAYDREAM_VOLDN_CLICK;
dd->base.inputs[5].name = XRT_INPUT_DAYDREAM_VOLUP_CLICK;
dd->base.inputs[6].name = XRT_INPUT_DAYDREAM_TOUCHPAD_VALUE_X;
dd->base.inputs[7].name = XRT_INPUT_DAYDREAM_TOUCHPAD_VALUE_Y;
dd->base.inputs[6].name = XRT_INPUT_DAYDREAM_TOUCHPAD;
dd->ble = ble;
dd->print_spew = print_spew;

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

@ -453,10 +453,8 @@ enum xrt_input_name
XRT_INPUT_DAYDREAM_CIRCLE_CLICK = XRT_INPUT_NAME(0x0042, BOOLEAN),
XRT_INPUT_DAYDREAM_VOLUP_CLICK = XRT_INPUT_NAME(0x0043, BOOLEAN),
XRT_INPUT_DAYDREAM_VOLDN_CLICK = XRT_INPUT_NAME(0x0044, BOOLEAN),
//! @todo This should be merged and be tagged as a touchpad, maybe.
XRT_INPUT_DAYDREAM_TOUCHPAD_VALUE_X = XRT_INPUT_NAME(0x0045, VEC1_ZERO_TO_ONE),
XRT_INPUT_DAYDREAM_TOUCHPAD_VALUE_Y = XRT_INPUT_NAME(0x0046, VEC1_ZERO_TO_ONE),
XRT_INPUT_DAYDREAM_POSE = XRT_INPUT_NAME(0x0047, POSE),
XRT_INPUT_DAYDREAM_TOUCHPAD = XRT_INPUT_NAME(0x0045, VEC2_MINUS_ONE_TO_ONE),
XRT_INPUT_DAYDREAM_POSE = XRT_INPUT_NAME(0x0046, POSE),
XRT_INPUT_INDEX_SYSTEM_CLICK = XRT_INPUT_NAME(0x0050, BOOLEAN),
XRT_INPUT_INDEX_SYSTEM_TOUCH = XRT_INPUT_NAME(0x0051, BOOLEAN),