+1

src/xrt/drivers/wmr/wmr_common.h

··· 35 #define WMR_CONTROLLER_RIGHT_PRODUCT_STRING "Motion controller - Right" 36 37 #define HP_VID 0x03f0 0 38 #define REVERB_G1_PID 0x0c6a 39 #define REVERB_G2_PID 0x0580 40 #define REVERB_G2_CONTROLLER_PID 0x066a /* On 0x045e Microsoft VID */

··· 35 #define WMR_CONTROLLER_RIGHT_PRODUCT_STRING "Motion controller - Right" 36 37 #define HP_VID 0x03f0 38 + #define VR1000_PID 0x0367 39 #define REVERB_G1_PID 0x0c6a 40 #define REVERB_G2_PID 0x0580 41 #define REVERB_G2_CONTROLLER_PID 0x066a /* On 0x045e Microsoft VID */

+1

src/xrt/drivers/wmr/wmr_hmd.c

··· 90 91 const struct wmr_headset_descriptor headset_map[] = { 92 {WMR_HEADSET_GENERIC, NULL, "Unknown WMR HMD", NULL, NULL, NULL}, /* Catch-all for unknown headsets */ 0 93 {WMR_HEADSET_REVERB_G1, "HP Reverb VR Headset VR1000-2xxx", "HP Reverb", wmr_hmd_activate_reverb, 94 wmr_hmd_deactivate_reverb, wmr_hmd_screen_enable_reverb}, 95 {WMR_HEADSET_REVERB_G2, "HP Reverb Virtual Reality Headset G2", "HP Reverb G2", wmr_hmd_activate_reverb,

··· 90 91 const struct wmr_headset_descriptor headset_map[] = { 92 {WMR_HEADSET_GENERIC, NULL, "Unknown WMR HMD", NULL, NULL, NULL}, /* Catch-all for unknown headsets */ 93 + {WMR_HEADSET_HP_VR1000, "HP Reverb VR Headset VR1000-1xxx", "HP VR1000", NULL, NULL, NULL}, /*! @todo init funcs */ 94 {WMR_HEADSET_REVERB_G1, "HP Reverb VR Headset VR1000-2xxx", "HP Reverb", wmr_hmd_activate_reverb, 95 wmr_hmd_deactivate_reverb, wmr_hmd_screen_enable_reverb}, 96 {WMR_HEADSET_REVERB_G2, "HP Reverb Virtual Reality Headset G2", "HP Reverb G2", wmr_hmd_activate_reverb,

+1

src/xrt/drivers/wmr/wmr_hmd.h

··· 34 enum wmr_headset_type 35 { 36 WMR_HEADSET_GENERIC, 0 37 WMR_HEADSET_REVERB_G1, 38 WMR_HEADSET_REVERB_G2, 39 WMR_HEADSET_SAMSUNG_XE700X3AI,

··· 34 enum wmr_headset_type 35 { 36 WMR_HEADSET_GENERIC, 37 + WMR_HEADSET_HP_VR1000, 38 WMR_HEADSET_REVERB_G1, 39 WMR_HEADSET_REVERB_G2, 40 WMR_HEADSET_SAMSUNG_XE700X3AI,

+8 -2

src/xrt/drivers/wmr/wmr_prober.c

··· 56 { 57 switch (device->vendor_id) { 58 case HP_VID: 59 - if (device->product_id != REVERB_G1_PID && device->product_id != REVERB_G2_PID) { 0 60 return false; 61 } 62 0 63 if (device->product_id == REVERB_G1_PID) 64 *out_hmd_type = WMR_HEADSET_REVERB_G1; 65 - else 66 *out_hmd_type = WMR_HEADSET_REVERB_G2; 0 0 0 0 67 68 *out_interface = 0; 69 return true;

··· 56 { 57 switch (device->vendor_id) { 58 case HP_VID: 59 + if (device->product_id != REVERB_G1_PID && device->product_id != REVERB_G2_PID && 60 + device->product_id != VR1000_PID) { 61 return false; 62 } 63 64 + 65 if (device->product_id == REVERB_G1_PID) 66 *out_hmd_type = WMR_HEADSET_REVERB_G1; 67 + else if (device->product_id == REVERB_G2_CONTROLLER_PID) 68 *out_hmd_type = WMR_HEADSET_REVERB_G2; 69 + else if (device->product_id == VR1000_PID) 70 + *out_hmd_type = WMR_HEADSET_HP_VR1000; 71 + else 72 + return false; 73 74 *out_interface = 0; 75 return true;