mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-06 07:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/steamvr: Use serial number for controller id

Browse source
This commit is contained in:
Christoph Haag 2021-02-12 00:26:54 +01:00
parent d5e74b959a
commit a4bde60e08
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/xrt/state_trackers/steamvr_drv/ovrd_driver.cpp
View file

@ -42,6 +42,8 @@ DEBUG_GET_ONCE_BOOL_OPTION(emulate_index_controller, "STEAMVR_EMULATE_INDEX_CONT
DEBUG_GET_ONCE_NUM_OPTION(scale_percentage, "XRT_COMPOSITOR_SCALE_PERCENTAGE", 140)
#define MODELNUM_LEN (XRT_DEVICE_NAME_LEN + 9) // "[Monado] "
//#define DUMP_POSE
//#define DUMP_POSE_CONTROLLERS
@ -148,16 +150,8 @@ public:
m_unObjectId = vr::k_unTrackedDeviceIndexInvalid;
m_pose = {};
// append xrt_hand because SteamVR serial must be unique
std::stringstream ss;
ss << "[Monado] " << xdev->str << " " << hand;
std::string name = ss.str();
strncpy(m_sSerialNumber, name.c_str(), XRT_DEVICE_NAME_LEN);
strncpy(m_sModelNumber, name.c_str(), XRT_DEVICE_NAME_LEN);
strncpy(m_sSerialNumber, name.c_str(), XRT_DEVICE_NAME_LEN);
strncpy(m_sModelNumber, name.c_str(), XRT_DEVICE_NAME_LEN);
snprintf(m_sModelNumber, MODELNUM_LEN, "[Monado] %s", xdev->str);
strncpy(m_sSerialNumber, xdev->serial, XRT_DEVICE_NAME_LEN);
switch (this->m_xdev->name) {
case XRT_DEVICE_INDEX_CONTROLLER:
@ -703,7 +697,7 @@ public:
private:
char m_sSerialNumber[XRT_DEVICE_NAME_LEN];
char m_sModelNumber[XRT_DEVICE_NAME_LEN];
char m_sModelNumber[MODELNUM_LEN];
const char *m_controller_type = NULL;