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

24
Controllers/RoccatController/RoccatBurstController/RoccatBurstController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "RoccatBurstController.h"
#include "StringUtils.h"
RoccatBurstController::RoccatBurstController(hid_device* dev_handle, const hid_device_info& info)
{
@ -18,19 +19,6 @@ RoccatBurstController::RoccatBurstController(hid_device* dev_handle, const hid_d
version = "";
location = info.path;
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());
}
SetupDirectMode();
}
@ -46,7 +34,15 @@ std::string RoccatBurstController::GetFirmwareVersion()
std::string RoccatBurstController::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 RoccatBurstController::GetDeviceLocation()

1
Controllers/RoccatController/RoccatBurstController/RoccatBurstController.h
View file

@ -63,7 +63,6 @@ public:
private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
unsigned int CalculateCRC(unsigned char* bytes);

24
Controllers/RoccatController/RoccatBurstProAirController/RoccatBurstProAirController.cpp
View file

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

1
Controllers/RoccatController/RoccatBurstProAirController/RoccatBurstProAirController.h
View file

@ -50,6 +50,5 @@ public:
private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
};

24
Controllers/RoccatController/RoccatEloController/RoccatEloController.cpp
View file

@ -12,6 +12,7 @@
#include <cmath>
#include <string.h>
#include "RoccatEloController.h"
#include "StringUtils.h"
RoccatEloController::RoccatEloController(hid_device* dev_handle, const hid_device_info& info)
{
@ -19,19 +20,6 @@ RoccatEloController::RoccatEloController(hid_device* dev_handle, const hid_devic
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());
}
SendInit();
}
@ -47,7 +35,15 @@ std::string RoccatEloController::GetDeviceLocation()
std::string RoccatEloController::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));
}
void RoccatEloController::SendInit()

1
Controllers/RoccatController/RoccatEloController/RoccatEloController.h
View file

@ -33,7 +33,6 @@ public:
private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
void SendInit();

24
Controllers/RoccatController/RoccatHordeAimoController/RoccatHordeAimoController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "RoccatHordeAimoController.h"
#include "StringUtils.h"
RoccatHordeAimoController::RoccatHordeAimoController(hid_device* dev_handle, const hid_device_info& info)
{
@ -18,19 +19,6 @@ RoccatHordeAimoController::RoccatHordeAimoController(hid_device* dev_handle, con
version = "";
location = info.path;
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());
}
InitialPacket();
}
@ -59,7 +47,15 @@ std::string RoccatHordeAimoController::GetFirmwareVersion()
std::string RoccatHordeAimoController::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 RoccatHordeAimoController::GetDeviceLocation()

1
Controllers/RoccatController/RoccatHordeAimoController/RoccatHordeAimoController.h
View file

@ -34,7 +34,6 @@ public:
private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
void InitialPacket();

15
Controllers/RoccatController/RoccatKoneAimoController/RoccatKoneAimoController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "RoccatKoneAimoController.h"
#include "StringUtils.h"
RoccatKoneAimoController::RoccatKoneAimoController(hid_device* dev_handle, char *_path)
{
@ -28,10 +29,6 @@ RoccatKoneAimoController::RoccatKoneAimoController(hid_device* dev_handle, char
wName = std::wstring(tmpName);
device_name.append(" ").append(std::string(wName.begin(), wName.end()));
hid_get_serial_number_string(dev, tmpName, szTemp);
wName = std::wstring(tmpName);
serial = std::string(wName.begin(), wName.end());
/*-----------------------------------------------------*\
| Init usb buffer to 0 and add first two bytes |
\*-----------------------------------------------------*/
@ -54,7 +51,15 @@ std::string RoccatKoneAimoController::GetDeviceName()
std::string RoccatKoneAimoController::GetSerial()
{
return serial;
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 RoccatKoneAimoController::GetLocation()

1
Controllers/RoccatController/RoccatKoneAimoController/RoccatKoneAimoController.h
View file

@ -50,7 +50,6 @@ public:
private:
std::string device_name;
std::string serial;
std::string location;
hid_device* dev;
unsigned char usb_colors_buf[USB_COLOR_BUFF_LEN]; // USB buffer to be sent everytime we update mouse's LEDs

24
Controllers/RoccatController/RoccatKoneProAirController/RoccatKoneProAirController.cpp
View file

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

1
Controllers/RoccatController/RoccatKoneProAirController/RoccatKoneProAirController.h
View file

@ -56,7 +56,6 @@ public:
private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
void SendRGB(bool direct, std::vector<RGBColor> colors, unsigned char mode_value, unsigned char speed, unsigned char brightness);

24
Controllers/RoccatController/RoccatKoneProController/RoccatKoneProController.cpp
View file

@ -11,6 +11,7 @@
#include <cstring>
#include "RoccatKoneProController.h"
#include "StringUtils.h"
RoccatKoneProController::RoccatKoneProController(hid_device* dev_handle, const hid_device_info& info)
{
@ -18,19 +19,6 @@ RoccatKoneProController::RoccatKoneProController(hid_device* dev_handle, const h
version = "";
location = info.path;
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());
}
SetupDirectMode();
}
@ -46,7 +34,15 @@ std::string RoccatKoneProController::GetFirmwareVersion()
std::string RoccatKoneProController::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 RoccatKoneProController::GetDeviceLocation()

1
Controllers/RoccatController/RoccatKoneProController/RoccatKoneProController.h
View file

@ -63,7 +63,6 @@ public:
private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
unsigned int CalculateCRC(unsigned char* bytes);

6
Controllers/RoccatController/RoccatKoneXPController/RoccatKoneXPController.cpp
View file

@ -14,6 +14,7 @@
#include <thread>
#include "LogManager.h"
#include "RoccatKoneXPController.h"
#include "StringUtils.h"
RoccatKoneXPController::RoccatKoneXPController(hid_device* dev_handle, char *path)
{
@ -53,10 +54,7 @@ std::string RoccatKoneXPController::GetSerial()
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));
}

17
Controllers/RoccatController/RoccatKovaController/RoccatKovaController.cpp
View file

@ -10,8 +10,9 @@
\*---------------------------------------------------------*/
#include <hidapi/hidapi.h>
#include "RoccatKovaController.h"
#include "LogManager.h"
#include "RoccatKovaController.h"
#include "StringUtils.h"
RoccatKovaController::RoccatKovaController(hid_device* dev_handle, char *path)
{
@ -34,21 +35,15 @@ std::string RoccatKovaController::GetLocation()
std::string RoccatKovaController::GetSerial()
{
const uint8_t sz = ROCCAT_KOVA_HID_MAX_STR;
wchar_t tmp[sz];
uint8_t ret = hid_get_serial_number_string(dev, tmp, sz);
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
LOG_DEBUG("[Roccat Kova] Get HID Serial string failed");
return "";
return("");
}
std::wstring w_tmp = std::wstring(tmp);
std::string serial = std::string(w_tmp.begin(), w_tmp.end());
return serial;
return(StringUtils::wstring_to_string(serial_string));
}
std::string RoccatKovaController::GetFirmwareVersion()

7
Controllers/RoccatController/RoccatSenseAimoController/RoccatSenseAimoController.cpp
View file

@ -12,6 +12,7 @@
#include <cstring>
#include "LogManager.h"
#include "RoccatSenseAimoController.h"
#include "StringUtils.h"
RoccatSenseAimoController::RoccatSenseAimoController(hid_device* dev_handle, char *path)
{
@ -51,11 +52,7 @@ std::string RoccatSenseAimoController::GetSerial()
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 RoccatSenseAimoController::GetLocation()

9
Controllers/RoccatController/RoccatVulcanKeyboardController/RoccatVulcanKeyboardController.cpp
View file

@ -14,8 +14,9 @@
#include <math.h>
#include <thread>
#include <vector>
#include "RoccatVulcanKeyboardController.h"
#include "LogManager.h"
#include "RoccatVulcanKeyboardController.h"
#include "StringUtils.h"
RoccatVulcanKeyboardController::RoccatVulcanKeyboardController(hid_device* dev_ctrl_handle, hid_device* dev_led_handle, char *path, uint16_t pid)
{
@ -41,11 +42,7 @@ std::string RoccatVulcanKeyboardController::GetSerial()
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 RoccatVulcanKeyboardController::GetLocation()