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

8
Controllers/SteelSeriesController/SteelSeriesApex3Controller/SteelSeriesApex3Controller.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "SteelSeriesApex3Controller.h"
#include "StringUtils.h"
SteelSeriesApex3Controller::SteelSeriesApex3Controller(hid_device* dev_handle, const char* path)
{
@ -33,13 +34,10 @@ std::string SteelSeriesApex3Controller::GetSerialString()
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if (ret != 0)
if(ret != 0)
{
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));
}

24
Controllers/SteelSeriesController/SteelSeriesArctis5Controller/SteelSeriesArctis5Controller.cpp
View file

@ -11,25 +11,13 @@
#include <string.h>
#include "SteelSeriesArctis5Controller.h"
#include "StringUtils.h"
SteelSeriesArctis5Controller::SteelSeriesArctis5Controller(hid_device* dev_handle, const hid_device_info& info)
{
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());
}
}
SteelSeriesArctis5Controller::~SteelSeriesArctis5Controller()
@ -44,7 +32,15 @@ std::string SteelSeriesArctis5Controller::GetDeviceLocation()
std::string SteelSeriesArctis5Controller::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 SteelSeriesArctis5Controller::GetFirmwareVersion()

1
Controllers/SteelSeriesController/SteelSeriesArctis5Controller/SteelSeriesArctis5Controller.h
View file

@ -32,7 +32,6 @@ public:
private:
std::string location;
std::string serial_number;
std::string version;
hid_device* dev;

8
Controllers/SteelSeriesController/SteelSeriesMouseController/SteelSeriesMouseController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "SteelSeriesMouseController.h"
#include "StringUtils.h"
SteelSeriesMouseController::SteelSeriesMouseController(hid_device* dev_handle, steelseries_type proto_type, const char* path)
{
@ -34,15 +35,12 @@ std::string SteelSeriesMouseController::GetSerialString()
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if (ret != 0)
if(ret != 0)
{
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));
}
steelseries_type SteelSeriesMouseController::GetMouseType()

8
Controllers/SteelSeriesController/SteelSeriesOldApexController/SteelSeriesOldApexController.cpp
View file

@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "SteelSeriesOldApexController.h"
#include "StringUtils.h"
static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
{
@ -66,15 +67,12 @@ std::string SteelSeriesOldApexController::GetSerialString()
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if (ret != 0)
if(ret != 0)
{
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));
}
steelseries_type SteelSeriesOldApexController::GetKeyboardType()

6
Controllers/SteelSeriesController/SteelSeriesQCKMatController/SteelSeriesQCKMatController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "SteelSeriesQCKMatController.h"
#include "StringUtils.h"
SteelSeriesQCKMatController::SteelSeriesQCKMatController(hid_device* dev_handle, const char* path)
{
@ -43,10 +44,7 @@ std::string SteelSeriesQCKMatController::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 SteelSeriesQCKMatController::SetColors(std::vector<RGBColor> colors)

8
Controllers/SteelSeriesController/SteelSeriesRivalController/SteelSeriesRivalController.cpp
View file

@ -14,6 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "SteelSeriesRivalController.h"
#include "StringUtils.h"
static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
{
@ -62,15 +63,12 @@ std::string SteelSeriesRivalController::GetSerialString()
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if (ret != 0)
if(ret != 0)
{
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));
}
std::string SteelSeriesRivalController::GetFirmwareVersion()

9
Controllers/SteelSeriesController/SteelSeriesSenseiController/SteelSeriesSenseiController.cpp
View file

@ -14,6 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "SteelSeriesSenseiController.h"
#include "StringUtils.h"
static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
{
@ -61,15 +62,13 @@ std::string SteelSeriesSenseiController::GetSerialString()
{
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if (ret != 0)
if(ret != 0)
{
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));
}
steelseries_type SteelSeriesSenseiController::GetMouseType()

8
Controllers/SteelSeriesController/SteelSeriesSiberiaController/SteelSeriesSiberiaController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "SteelSeriesSiberiaController.h"
#include "StringUtils.h"
static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
{
@ -64,15 +65,12 @@ std::string SteelSeriesSiberiaController::GetSerialString()
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if (ret != 0)
if(ret != 0)
{
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 SteelSeriesSiberiaController::SetColor