Skip to content

Commit e1d607d

Browse files
committed
Send HMD manufacturer name
1 parent cba4814 commit e1d607d

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/VRDriver.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,28 @@ void SlimeVRDriver::VRDriver::RunPoseRequestThread() {
6767
auto serial = vr::VRProperties()->GetStringProperty(hmd_prop_container, vr::Prop_SerialNumber_String, &error);
6868
if (error != vr::ETrackedPropertyError::TrackedProp_Success) {
6969
logger_->Log("Failed to get HMD's Prop_SerialNumber_String: {}", vr::VRPropertiesRaw()->GetPropErrorNameFromEnum(error));
70-
} else {
71-
logger_->Log("HMD serial number: {}", serial);
7270
}
71+
7372
auto name = vr::VRProperties()->GetStringProperty(hmd_prop_container, vr::Prop_ModelNumber_String, &error);
7473
if (error != vr::ETrackedPropertyError::TrackedProp_Success) {
7574
logger_->Log("Failed to get HMD's Prop_ModelNumber_String: {}", vr::VRPropertiesRaw()->GetPropErrorNameFromEnum(error));
76-
} else {
77-
logger_->Log("HMD model number: {}", name);
7875
}
7976

77+
auto manufacturer = vr::VRProperties()->GetStringProperty(hmd_prop_container, vr::Prop_ManufacturerName_String, &error);
78+
if (error != vr::ETrackedPropertyError::TrackedProp_Success) {
79+
logger_->Log("Failed to get HMD's Prop_ModelNumber_String: {}", vr::VRPropertiesRaw()->GetPropErrorNameFromEnum(error));
80+
}
81+
82+
logger_->Log("HMD props: serial='{}', model='{}', manufacturer='{}'", serial, name, manufacturer);
83+
8084
// Send add message for HMD
8185
messages::TrackerAdded* tracker_added = google::protobuf::Arena::CreateMessage<messages::TrackerAdded>(&arena_);
8286
message->set_allocated_tracker_added(tracker_added);
8387
tracker_added->set_tracker_id(0);
8488
tracker_added->set_tracker_role(TrackerRole::HMD);
8589
tracker_added->set_tracker_serial(serial.empty() ? "HMD" : serial);
8690
tracker_added->set_tracker_name(name.empty() ? "HMD" : name);
91+
tracker_added->set_manufacturer(manufacturer.empty() ? "OpenVR" : manufacturer);
8792
bridge_->SendBridgeMessage(*message);
8893

8994
messages::TrackerStatus* tracker_status = google::protobuf::Arena::CreateMessage<messages::TrackerStatus>(&arena_);

src/bridge/ProtobufMessages.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ message TrackerAdded {
8686
string tracker_serial = 2;
8787
string tracker_name = 3;
8888
int32 tracker_role = 4;
89+
string manufacturer = 5;
8990
}
9091

9192
message TrackerStatus {

0 commit comments

Comments
 (0)