jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move wstring to string conversion to StringUtils.cpp and update most HID get serial number functions to use it

Browse source
This commit is contained in:
Adam Honse 2024-07-28 03:50:29 -05:00
parent 366fda30f5
commit b4d15b9545
159 changed files with 623 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Controllers/WinbondGamingKeyboardController/WinbondGamingKeyboardController.cpp
View file

@ -11,9 +11,10 @@
#include <algorithm>
#include <string.h>
#include "LogManager.h"
#include "StringUtils.h"
#include "WinbondGamingKeyboardController.h"
#include "RGBController_WinbondGamingKeyboard.h"
#include "LogManager.h"
#define WINBOND_HID_DATA_LEN 64
@ -202,22 +203,17 @@ void WinbondGamingKeyboardController::SetVersionLayout()
version = "???";
}
std::string WinbondGamingKeyboardController::GetSerialString() const
std::string WinbondGamingKeyboardController::GetSerialString()
{
wchar_t serial_wchar[128] = {};
int ret = hid_get_serial_number_string(dev, serial_wchar, 128);
if(ret == -1)
{
return "";
}
std::wstring serial_wstring(serial_wchar);
std::string serial_string;
std::transform(serial_wstring.begin(), serial_wstring.end(), std::back_inserter(serial_string), [] (wchar_t i)
{
return (char)i;
});
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
return serial_string;
if(ret != 0)
{
return("");
}
return(StringUtils::wstring_to_string(serial_string));
}
static void setModeImpl(hid_device* dev, bool is_logo, unsigned char effect_mode, unsigned char colors[2][3],

2
Controllers/WinbondGamingKeyboardController/WinbondGamingKeyboardController.h
View file

@ -26,7 +26,7 @@ class WinbondGamingKeyboardController
public:
WinbondGamingKeyboardController(hid_device *dev_handle, const hid_device_info &info, const std::string& name);
std::string GetSerialString() const;
std::string GetSerialString();
const char* GetDeviceLocation() const
{