+14

src/xrt/auxiliary/vive/vive_common.h

reviewed

··· 3 3 /*! 4 4 * @file 5 5 * @brief Common things like defines for Vive and Index. 6 6 + * @author Lubosz Sarnecki <lubosz.sarnecki@collabora.com> 6 7 * @author Jakob Bornecrantz <jakob@collabora.com> 7 8 * @ingroup aux_vive 8 9 */ ··· 30 31 * 31 32 * @brief @ref aux_vive files. 32 33 */ 34 34 + 35 35 + 36 36 + #define HTC_VID 0x0bb4 37 37 + #define VALVE_VID 0x28de 38 38 + 39 39 + #define VIVE_PID 0x2c87 40 40 + #define VIVE_LIGHTHOUSE_FPGA_RX 0x2000 41 41 + 42 42 + #define VIVE_PRO_MAINBOARD_PID 0x0309 43 43 + #define VIVE_PRO_LHR_PID 0x2300 44 44 + 45 45 + #define VIVE_WATCHMAN_DONGLE 0x2101 46 46 + #define VIVE_WATCHMAN_DONGLE_GEN2 0x2102 33 47 34 48 35 49 #ifdef __cplusplus

+2

src/xrt/drivers/vive/vive_prober.c

reviewed

··· 14 14 #include "util/u_prober.h" 15 15 #include "util/u_trace_marker.h" 16 16 17 17 + #include "vive/vive_common.h" 18 18 + 17 19 #include "vive_device.h" 18 20 #include "vive_controller.h" 19 21 #include "vive_prober.h"

-13

src/xrt/drivers/vive/vive_prober.h

reviewed

··· 28 28 * @brief Driver for the HTC Vive and Valve Index family of HMDs. 29 29 */ 30 30 31 31 - #define HTC_VID 0x0bb4 32 32 - #define VALVE_VID 0x28de 33 33 - 34 34 - #define VIVE_PID 0x2c87 35 35 - #define VIVE_LIGHTHOUSE_FPGA_RX 0x2000 36 36 - 37 37 - #define VIVE_PRO_MAINBOARD_PID 0x0309 38 38 - #define VIVE_PRO_LHR_PID 0x2300 39 39 - 40 40 - #define VIVE_WATCHMAN_DONGLE 0x2101 41 41 - #define VIVE_WATCHMAN_DONGLE_GEN2 0x2102 42 42 - 43 43 - 44 31 /*! 45 32 * Probing function for Vive devices. 46 33 *

+2

src/xrt/targets/common/target_builder_lighthouse.c

reviewed

··· 24 24 25 25 #include "target_builder_interface.h" 26 26 27 27 + #include "vive/vive_common.h" 27 28 #include "vive/vive_config.h" 28 29 #include "vive/vive_calibration.h" 29 30 #include "v4l2/v4l2_interface.h" ··· 31 32 #include "xrt/xrt_frameserver.h" 32 33 #include "xrt/xrt_results.h" 33 34 #include "xrt/xrt_tracking.h" 35 35 + 34 36 35 37 #include <assert.h> 36 38