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/wmr: Reverb G1 proximity sensor support

Browse source
This commit is contained in:
nima01 2022-02-02 02:27:55 +01:00
parent 309c45f4c4
commit 45466e419b
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/xrt/drivers/wmr/wmr_hmd.c
View file

@ -257,7 +257,7 @@ hololens_sensors_read_packets(struct wmr_hmd *wh)
int size = os_hid_read(wh->hid_hololens_sensors_dev, buffer, sizeof(buffer), 100);
if (size < 0) {
WMR_ERROR(wh, "Error reading from device");
WMR_ERROR(wh, "Error reading from Hololens Sensors device. Call to os_hid_read returned %i", size);
return false;
} else if (size == 0) {
WMR_TRACE(wh, "No more data to read");
@ -349,7 +349,7 @@ hololens_sensors_read_packets(struct wmr_hmd *wh)
static void
control_ipd_value_decode(struct wmr_hmd *wh, const unsigned char *buffer, int size)
{
if (size != 4) {
if (size != 2 && size != 4) {
WMR_ERROR(wh, "Invalid control ipd distance packet size (expected 4 but got %i)", size);
return;
}
@ -361,7 +361,7 @@ control_ipd_value_decode(struct wmr_hmd *wh, const unsigned char *buffer, int si
}
uint8_t proximity = read8(&buffer);
uint16_t ipd_value = read16(&buffer);
uint16_t ipd_value = (size == 4) ? read16(&buffer) : wh->raw_ipd;
bool changed = (wh->raw_ipd != ipd_value) || (wh->proximity_sensor != proximity);
@ -382,7 +382,8 @@ control_read_packets(struct wmr_hmd *wh)
int size = os_hid_read(wh->hid_control_dev, buffer, sizeof(buffer), 0);
if (size < 0) {
WMR_ERROR(wh, "Error reading from device");
WMR_ERROR(wh, "Error reading from companion (HMD control) device. Call to os_hid_read returned %i",
size);
return false;
} else if (size == 0) {
WMR_TRACE(wh, "No more data to read");
@ -395,10 +396,21 @@ control_read_packets(struct wmr_hmd *wh)
case WMR_CONTROL_MSG_IPD_VALUE: //
control_ipd_value_decode(wh, buffer, size);
break;
case WMR_CONTROL_MSG_UNKNOWN_02: //
WMR_DEBUG(wh, "Unknown message type: %02x (size %i)", buffer[0], size);
if (size == 4) {
// Todo: Decode.
// On Reverb G1 this message is sometimes received right after a
// proximity/IPD message, and it always seems to be '02 XX 0d 26'.
WMR_DEBUG(wh, "---> Type and content bytes: %02x %02x %02x %02x", buffer[0], buffer[1],
buffer[2], buffer[3]);
}
break;
case WMR_CONTROL_MSG_UNKNOWN_05: //
WMR_DEBUG(wh, "Unknown message type: %02x (size %i)", buffer[0], size);
break;
default: //
WMR_DEBUG(wh, "Unknown message type: %02x, (%i)", buffer[0], size);
WMR_DEBUG(wh, "Unknown message type: %02x (size %i)", buffer[0], size);
break;
}

1
src/xrt/drivers/wmr/wmr_protocol.h
View file

@ -41,6 +41,7 @@ extern "C" {
// Messages types specific to WMR Hololens Sensors' companion devices
#define WMR_CONTROL_MSG_IPD_VALUE 0x01
#define WMR_CONTROL_MSG_UNKNOWN_02 0x02 // Seen in relation to proximity events on Reverb G1
#define WMR_CONTROL_MSG_UNKNOWN_05 0x05
// Message sub-types for WMR_MS_HOLOLENS_MSG_BT_IFACE WMR Hololens Sensors message