diff --git a/Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.cpp b/Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.cpp index 34c7558d..9ba4142c 100644 --- a/Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.cpp +++ b/Controllers/LianLiController/LianLiUniHubSLInfinityController/LianLiUniHubSLInfinityController.cpp @@ -14,6 +14,7 @@ #include #include "LianLiUniHubSLInfinityController.h" +#include "StringUtils.h" using namespace std::chrono_literals; @@ -44,8 +45,7 @@ std::string LianLiUniHubSLInfinityController::GetFirmwareVersionString() return (""); } - std::wstring return_wstring = product_string; - std::string return_string(return_wstring.begin(),return_wstring.end()); + std::string return_string = StringUtils::wstring_to_string(product_string); return(return_string.substr(return_string.find_last_of("-")+1,4).c_str()); } @@ -57,19 +57,15 @@ std::string LianLiUniHubSLInfinityController::GetName() std::string LianLiUniHubSLInfinityController::GetSerialString() { - wchar_t serial_string[20]; - int ret = hid_get_serial_number_string(dev, serial_string, 20); + wchar_t serial_string[128]; + int ret = hid_get_serial_number_string(dev, serial_string, 128); - if (ret != 0) + if(ret != 0) { - return (""); + return(""); } - std::wstring return_wstring = serial_string; - std::string return_string(return_wstring.begin(), return_wstring.end()); - - return(return_string); - + return(StringUtils::wstring_to_string(serial_string)); } float infinityBrightnessLimit(RGBColor color)