Update openvr to latest stable 1.0.5

OSVRViveTracker.cpp

@@ -675,6 +675,13 @@ namespace vive {
                           << unWhichDevice << std::endl;
             }
             break;
+        case vr::TrackedProp_PermissionDenied:
+            /// Refused to give us an update because of permission
+            std::cout << "error: TrackedProp_PermissionDenied when getting "
+                         "universe ID from "
+                      << unWhichDevice << std::endl;
+            return;
+            break;
         default:
             std::cout << "Got unrecognized error " << err
                       << " when getting universe ID from " << unWhichDevice

PropertyHelper.h

@@ -141,10 +141,9 @@ namespace vive {
                 assert(dev != nullptr &&
                        "Tried to get a string property from a null device "
                        "pointer.");
-                static const auto INITIAL_BUFFER_SIZE =
-                    vr::k_unTrackingStringSize;
-                /// Start with a buffer of k_unTrackingStringSize as suggested.
-                std::vector<char> buf(INITIAL_BUFFER_SIZE, '\0');
+
+                /// Get a buffer of max string size
+                std::vector<char> buf(vr::k_unMaxPropertyStringSize, '\0');
                 vr::ETrackedPropertyError err = vr::TrackedProp_Success;
                 auto ret = dev->GetStringTrackedDeviceProperty(
                     args..., prop, buf.data(),
@@ -155,32 +154,15 @@ namespace vive {
                 }
 
                 if (ret > buf.size()) {
+                    /// received a buffer greater than 32768 chars, which should
+                    /// not happen
                     std::cout
-                        << "[getStringProperty] Got an initial return value "
-                           "larger than the buffer size: ret = "
-                        << ret << ", buf.size() = " << buf.size() << std::endl;
-                }
-                if (vr::TrackedProp_BufferTooSmall == err) {
-                    // first buffer was too small, but now we know how big it
-                    // should be, per the docs.
-                    /// @todo remove this debug print
-                    std::cout << "[getStringProperty] Initial buffer size: "
-                              << buf.size() << ", return value: " << ret
-                              << std::endl;
-                    buf.resize(ret + 1, '\0');
-                    ret = dev->GetStringTrackedDeviceProperty(
-                        args..., prop, buf.data(),
-                        static_cast<uint32_t>(buf.size()), &err);
-                }
-
-                if (ret > buf.size()) {
-                    std::cout
-                        << "[getStringProperty] THIS SHOULDN'T HAPPEN: Got a "
+                        << "[getStringProperty] THAT SHOULD NOT HAPPEN Got a "
                            "return value larger than the buffer size: ret = "
                         << ret << ", buf.size() = " << buf.size() << std::endl;
-
                     return std::make_pair(std::string{}, err);
                 }
+
                 return std::make_pair(std::string{buf.data()}, err);
             }
         };

PropertyTraits.h

@@ -92,6 +92,7 @@ namespace vive {
         DriverVersion = vr::Prop_DriverVersion_String,
         Firmware_ForceUpdateRequired =
             vr::Prop_Firmware_ForceUpdateRequired_Bool,
+        ViveSystemButtonFixRequired = vr::Prop_ViveSystemButtonFixRequired_Bool,
         ReportsTimeSinceVSync = vr::Prop_ReportsTimeSinceVSync_Bool,
         SecondsFromVsyncToPhotons = vr::Prop_SecondsFromVsyncToPhotons_Float,
         DisplayFrequency = vr::Prop_DisplayFrequency_Float,
@@ -131,6 +132,7 @@ namespace vive {
         ScreenshotVerticalFieldOfViewDegrees =
             vr::Prop_ScreenshotVerticalFieldOfViewDegrees_Float,
         DisplaySuppressed = vr::Prop_DisplaySuppressed_Bool,
+        DisplayAllowNightMode = vr::Prop_DisplayAllowNightMode_Bool,
         AttachedDeviceId = vr::Prop_AttachedDeviceId_String,
         SupportedButtons = vr::Prop_SupportedButtons_Uint64,
         Axis0Type = vr::Prop_Axis0Type_Int32,
@@ -144,7 +146,21 @@ namespace vive {
         FieldOfViewBottomDegrees = vr::Prop_FieldOfViewBottomDegrees_Float,
         TrackingRangeMinimumMeters = vr::Prop_TrackingRangeMinimumMeters_Float,
         TrackingRangeMaximumMeters = vr::Prop_TrackingRangeMaximumMeters_Float,
-        ModeLabel = vr::Prop_ModeLabel_String
+        ModeLabel = vr::Prop_ModeLabel_String,
+        IconPathName = vr::Prop_IconPathName_String,
+        NamedIconPathDeviceOff = vr::Prop_NamedIconPathDeviceOff_String,
+        NamedIconPathDeviceSearching =
+            vr::Prop_NamedIconPathDeviceSearching_String,
+        NamedIconPathDeviceSearchingAlert =
+            vr::Prop_NamedIconPathDeviceSearchingAlert_String,
+        NamedIconPathDeviceReady = vr::Prop_NamedIconPathDeviceReady_String,
+        NamedIconPathDeviceReadyAlert =
+            vr::Prop_NamedIconPathDeviceReadyAlert_String,
+        NamedIconPathDeviceNotReady =
+            vr::Prop_NamedIconPathDeviceNotReady_String,
+        NamedIconPathDeviceStandby = vr::Prop_NamedIconPathDeviceStandby_String,
+        NamedIconPathDeviceAlertLow =
+            vr::Prop_NamedIconPathDeviceAlertLow_String
     };
     namespace detail {
         template <std::size_t EnumVal> struct PropertyTypeTrait;
@@ -267,6 +283,10 @@ namespace vive {
             using type = bool;
         };
         template <>
+        struct PropertyTypeTrait<vr::Prop_ViveSystemButtonFixRequired_Bool> {
+            using type = bool;
+        };
+        template <>
         struct PropertyTypeTrait<vr::Prop_ReportsTimeSinceVSync_Bool> {
             using type = bool;
         };
@@ -398,6 +418,10 @@ namespace vive {
         template <> struct PropertyTypeTrait<vr::Prop_DisplaySuppressed_Bool> {
             using type = bool;
         };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_DisplayAllowNightMode_Bool> {
+            using type = bool;
+        };
         template <> struct PropertyTypeTrait<vr::Prop_AttachedDeviceId_String> {
             using type = std::string;
         };
@@ -446,6 +470,43 @@ namespace vive {
         template <> struct PropertyTypeTrait<vr::Prop_ModeLabel_String> {
             using type = std::string;
         };
+        template <> struct PropertyTypeTrait<vr::Prop_IconPathName_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_NamedIconPathDeviceOff_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_NamedIconPathDeviceSearching_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<
+            vr::Prop_NamedIconPathDeviceSearchingAlert_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_NamedIconPathDeviceReady_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<
+            vr::Prop_NamedIconPathDeviceReadyAlert_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_NamedIconPathDeviceNotReady_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_NamedIconPathDeviceStandby_String> {
+            using type = std::string;
+        };
+        template <>
+        struct PropertyTypeTrait<vr::Prop_NamedIconPathDeviceAlertLow_String> {
+            using type = std::string;
+        };
     } // namespace detail
 
 } // namespace vive

ServerDriverHost.cpp

@@ -149,3 +149,8 @@ bool ServerDriverHost::IsExiting() {
     LOG_EVENTS("IsExiting()");
     return isExiting_;
 }
+
+bool ServerDriverHost::PollNextEvent(VREvent_t *pEvent, uint32_t uncbVREvent) {
+    LOG_EVENTS("PollNextEvent()");
+    return false;
+}

ServerDriverHost.h

@@ -90,6 +90,8 @@ class ServerDriverHost : public vr::IServerDriverHost {
 
     virtual bool IsExiting();
 
+    virtual bool PollNextEvent(VREvent_t *pEvent, uint32_t uncbVREvent);
+
     IVRSettings *vrSettings = nullptr;
 
   private:

VRSettings.cpp

@@ -55,9 +55,9 @@ bool VRSettings::Sync(bool bForce, EVRSettingsError *peError) {
 }
 
 bool VRSettings::GetBool(const char *pchSection, const char *pchSettingsKey,
-                         bool bDefaultValue, EVRSettingsError *peError) {
+                         EVRSettingsError *peError) {
     LOG_EVENTS("GetBool(" << pchSection << ", " << pchSettingsKey << ", "
-                          << bDefaultValue << ", " << peError << ")");
+                          << peError << ")");
     // return true for now
     return true;
 }
@@ -81,9 +81,9 @@ void VRSettings::SetInt32(const char *pchSection, const char *pchSettingsKey,
 }
 
 float VRSettings::GetFloat(const char *pchSection, const char *pchSettingsKey,
-                           float flDefaultValue, EVRSettingsError *peError) {
+                           EVRSettingsError *peError) {
     LOG_EVENTS("SetInt32(" << pchSection << ", " << pchSettingsKey << ", "
-                           << flDefaultValue << ", " << peError << ")");
+                           << peError << ")");
     return 67.0;
 }
 
@@ -94,11 +94,9 @@ void VRSettings::SetFloat(const char *pchSection, const char *pchSettingsKey,
 }
 
 void GetString(const char *pchSection, const char *pchSettingsKey,
-               char *pchValue, uint32_t unValueLen, const char *pchDefaultValue,
-               EVRSettingsError *peError) {
+               char *pchValue, uint32_t unValueLen, EVRSettingsError *peError) {
     LOG_EVENTS("SetInt32(" << pchSection << ", " << pchSettingsKey << ", "
-                           << unValueLen << ", " << pchDefaultValue << ", "
-                           << peError << ")");
+                           << unValueLen << ", " << peError << ")");
 }
 
 void VRSettings::SetString(const char *pchSection, const char *pchSettingsKey,

VRSettings.h

@@ -44,7 +44,6 @@ class VRSettings : public IVRSettings {
     virtual bool Sync(bool bForce = false, EVRSettingsError *peError = nullptr);
 
     virtual bool GetBool(const char *pchSection, const char *pchSettingsKey,
-                         bool bDefaultValue,
                          EVRSettingsError *peError = nullptr);
     virtual void SetBool(const char *pchSection, const char *pchSettingsKey,
                          bool bValue, EVRSettingsError *peError = nullptr);
@@ -54,18 +53,15 @@ class VRSettings : public IVRSettings {
     virtual void SetInt32(const char *pchSection, const char *pchSettingsKey,
                           int32_t nValue, EVRSettingsError *peError = nullptr);
     virtual float GetFloat(const char *pchSection, const char *pchSettingsKey,
-                           float flDefaultValue,
                            EVRSettingsError *peError = nullptr);
     virtual void SetFloat(const char *pchSection, const char *pchSettingsKey,
                           float flValue, EVRSettingsError *peError = nullptr);
     virtual void GetString(const char *pchSection, const char *pchSettingsKey,
                            char *pchValue, uint32_t unValueLen,
-                           const char *pchDefaultValue,
                            EVRSettingsError *peError = nullptr);
     virtual void SetString(const char *pchSection, const char *pchSettingsKey,
                            const char *pchValue,
                            EVRSettingsError *peError = nullptr);
-
     virtual void RemoveSection(const char *pchSection,
                                EVRSettingsError *peError = nullptr);
     virtual void RemoveKeyInSection(const char *pchSection,