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

6
Controllers/HyperXMouseController/HyperXPulsefireDartController/HyperXPulsefireDartController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXPulsefireDartController.h"
#include "StringUtils.h"
HyperXPulsefireDartController::HyperXPulsefireDartController(hid_device* dev_handle, const char* path)
{
@ -38,10 +39,7 @@ std::string HyperXPulsefireDartController::GetSerialString()
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));
}
/*-------------------------------------------------------------------------------------------------*\

6
Controllers/HyperXMouseController/HyperXPulsefireFPSProController/HyperXPulsefireFPSProController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXPulsefireFPSProController.h"
#include "StringUtils.h"
HyperXPulsefireFPSProController::HyperXPulsefireFPSProController(hid_device* dev_handle, const char* path)
{
@ -38,10 +39,7 @@ std::string HyperXPulsefireFPSProController::GetSerialString()
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));
}
/*-------------------------------------------------------------------------------------------------*\

6
Controllers/HyperXMouseController/HyperXPulsefireHasteController/HyperXPulsefireHasteController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXPulsefireHasteController.h"
#include "StringUtils.h"
HyperXPulsefireHasteController::HyperXPulsefireHasteController(hid_device* dev_handle, const char* path)
{
@ -38,10 +39,7 @@ std::string HyperXPulsefireHasteController::GetSerialString()
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));
}
void HyperXPulsefireHasteController::SendDirect

25
Controllers/HyperXMouseController/HyperXPulsefireRaidController/HyperXPulsefireRaidController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXPulsefireRaidController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@ -19,20 +20,6 @@ HyperXPulsefireRaidController::HyperXPulsefireRaidController(hid_device* dev_han
dev = dev_handle;
location = info.path;
version = "";
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
serial_number = "";
}
else
{
std::wstring return_wstring = serial_string;
serial_number = std::string(return_wstring.begin(), return_wstring.end());
}
}
HyperXPulsefireRaidController::~HyperXPulsefireRaidController()
@ -47,7 +34,15 @@ std::string HyperXPulsefireRaidController::GetDeviceLocation()
std::string HyperXPulsefireRaidController::GetSerialString()
{
return(serial_number);
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
return("");
}
return(StringUtils::wstring_to_string(serial_string));
}
std::string HyperXPulsefireRaidController::GetFirmwareVersion()

1
Controllers/HyperXMouseController/HyperXPulsefireRaidController/HyperXPulsefireRaidController.h
View file

@ -44,7 +44,6 @@ protected:
private:
std::string location;
std::string serial_number;
std::string version;
void Send(unsigned char* packet);

6
Controllers/HyperXMouseController/HyperXPulsefireSurgeController/HyperXPulsefireSurgeController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXPulsefireSurgeController.h"
#include "StringUtils.h"
HyperXPulsefireSurgeController::HyperXPulsefireSurgeController(hid_device* dev_handle, const char* path)
{
@ -38,10 +39,7 @@ std::string HyperXPulsefireSurgeController::GetSerialString()
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));
}
/*-------------------------------------------------------------------------------------------------*\