mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2025-12-24 07:47:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

7
Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp
View File

@@ -9,12 +9,11 @@
| SPDX-License-Identifier: GPL-2.0-only |
\*---------------------------------------------------------*/
#include <codecvt>
#include <cstring>
#include <locale>
#include <stdio.h>
#include <stdlib.h>
#include "AMDWraithPrismController.h"
#include "StringUtils.h"
AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const char* path)
{
@@ -57,9 +56,7 @@ std::string AMDWraithPrismController::GetSerialString()
return("");
}
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
return(converter.to_bytes(serial_string));
return(StringUtils::wstring_to_string(serial_string));
}
std::string AMDWraithPrismController::GetFirmwareVersionString()

6
Controllers/AOCKeyboardController/AOCKeyboardController.cpp
View File

@@ -13,6 +13,7 @@
#include <cstring>
#include <thread>
#include "AOCKeyboardController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -42,10 +43,7 @@ std::string AOCKeyboardController::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 AOCKeyboardController::SetLightingConfig

6
Controllers/AOCMouseController/AOCMouseController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "AOCMouseController.h"
#include "StringUtils.h"
AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path)
{
@@ -38,10 +39,7 @@ std::string AOCMouseController::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/AOCMousematController/AOCMousematController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "AOCMousematController.h"
#include "StringUtils.h"
AOCMousematController::AOCMousematController(hid_device* dev_handle, const char* path)
{
@@ -38,10 +39,7 @@ std::string AOCMousematController::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/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp
View File

@@ -15,6 +15,7 @@
#include "RGBController.h"
#include "ResourceManager.h"
#include "SettingsManager.h"
#include "StringUtils.h"
#include "ASRockPolychromeUSBController.h"
#include "dmiinfo.h"
@@ -80,10 +81,7 @@ std::string PolychromeUSBController::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 PolychromeUSBController::SetDeviceInfo()

5
Controllers/AlienwareController/AlienwareController.cpp
View File

@@ -19,6 +19,7 @@
#include "RGBController.h"
#include "AlienwareController.h"
#include "LogManager.h"
#include "StringUtils.h"
typedef uint32_t alienware_platform_id;
@@ -87,9 +88,7 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic
/*-----------------------------------------------------*\
| Get serial number |
\*-----------------------------------------------------*/
std::wstring tmp_serial_number;
tmp_serial_number = info.serial_number;
serial_number = std::string(tmp_serial_number.begin(), tmp_serial_number.end());
serial_number = StringUtils::wstring_to_string(info.serial_number);
/*-----------------------------------------------------*\
| Get zone information by checking firmware |

6
Controllers/AnnePro2Controller/AnnePro2Controller.cpp
View File

@@ -10,6 +10,7 @@
\*---------------------------------------------------------*/
#include "AnnePro2Controller.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -39,10 +40,7 @@ std::string AnnePro2Controller::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 AnnePro2Controller::SendDirect(unsigned char frame_count, unsigned char * frame_data)

6
Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "AsusAuraCoreController.h"
#include "StringUtils.h"
#define AURA_CORE_MAX_MESSAGE_SIZE 64
@@ -49,10 +50,7 @@ std::string AuraCoreController::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 AuraCoreController::SendBrightness

15
Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp
View File

@@ -11,6 +11,7 @@
#include "AsusAuraCoreLaptopController.h"
#include "SettingsManager.h"
#include "StringUtils.h"
static uint8_t packet_map[ASUSAURACORELAPTOP_KEYCOUNT +
ASUSAURACORELAPTOP_LIGHTBARCOUNT +
@@ -95,21 +96,15 @@ std::string AsusAuraCoreLaptopController::GetDeviceName()
std::string AsusAuraCoreLaptopController::GetSerial()
{
const uint8_t sz = HID_MAX_STR;
wchar_t tmp[sz];
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
int ret = hid_get_serial_number_string(dev, tmp, sz);
if (ret != 0)
if(ret != 0)
{
LOG_DEBUG("[%s] Get HID Serial string failed", device_name.c_str());
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 AsusAuraCoreLaptopController::GetLocation()

6
Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp
View File

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

6
Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.cpp
View File

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

6
Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include "AsusAuraMonitorController.h"
#include "LogManager.h"
#include "StringUtils.h"
AuraMonitorController::AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid)
{
@@ -40,10 +41,7 @@ std::string AuraMonitorController::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 AuraMonitorController::BeginUpdate()

6
Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "AsusAuraMouseController.h"
#include "StringUtils.h"
AuraMouseController::AuraMouseController(hid_device* dev_handle, const char* path, uint16_t pid)
{
@@ -65,10 +66,7 @@ std::string AuraMouseController::GetSerialString()
return("");
}
std::wstring serial_wstring = serial_string;
std::string return_string = CleanSerial(serial_wstring);
return(return_string);
return(StringUtils::wstring_to_string(serial_string));
}
std::string AuraMouseController::GetVersion(bool wireless, int protocol)

6
Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.cpp
View File

@@ -13,6 +13,7 @@
#include <chrono>
#include <thread>
#include "AsusAuraMouseGen1Controller.h"
#include "StringUtils.h"
AsusAuraMouseGen1Controller::AsusAuraMouseGen1Controller(hid_device* dev_handle, const char* path, uint16_t pid)
{
@@ -41,10 +42,7 @@ std::string AsusAuraMouseGen1Controller::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));
}
std::string AsusAuraMouseGen1Controller::GetVersion()

6
Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.cpp
View File

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

6
Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.cpp
View File

@@ -17,6 +17,7 @@
#include <string.h>
#include <vector>
#include "AsusAuraTUFKeyboardController.h"
#include "StringUtils.h"
AuraTUFKeyboardController::AuraTUFKeyboardController(hid_device* dev_handle, const char* path, uint16_t pid, unsigned short version)
{
@@ -70,10 +71,7 @@ std::string AuraTUFKeyboardController::GetSerialString()
return("");
}
std::wstring serial_wstring = serial_string;
std::string return_string = clean_serial(serial_wstring);
return(return_string);
return(StringUtils::wstring_to_string(serial_string));
}
std::string AuraTUFKeyboardController::GetVersion()

6
Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include "AsusAuraUSBController.h"
#include "LogManager.h"
#include "StringUtils.h"
AuraUSBController::AuraUSBController(hid_device* dev_handle, const char* path)
{
@@ -52,10 +53,7 @@ std::string AuraUSBController::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));
}
const std::vector<AuraDeviceInfo>& AuraUSBController::GetAuraDevices() const

6
Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "AsusROGAllyController.h"
#include "StringUtils.h"
ROGAllyController::ROGAllyController(hid_device* dev_handle, const char* path)
{
@@ -40,10 +41,7 @@ std::string ROGAllyController::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));
}
std::string ROGAllyController::GetVersion()

6
Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp
View File

@@ -17,6 +17,7 @@
#include <string.h>
#include <vector>
#include "AsusCerberusKeyboardController.h"
#include "StringUtils.h"
#define ASUS_CERBERUS_KB_PACKET_SIZE 8
@@ -47,10 +48,7 @@ std::string AsusCerberusKeyboardController::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));
}
std::string AsusCerberusKeyboardController::GetVersion()

6
Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp
View File

@@ -16,6 +16,7 @@
#include <vector>
#include "AsusSagarisKeyboardController.h"
#include "LogManager.h"
#include "StringUtils.h"
#define ASUS_SAGARIS_KB_PACKET_SIZE 65
@@ -51,10 +52,7 @@ std::string AsusSagarisKeyboardController::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));
}
sagaris_mode AsusSagarisKeyboardController::GetMode()

6
Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include <string>
#include "AsusStrixClawController.h"
#include "StringUtils.h"
StrixClawController::StrixClawController(hid_device* dev_handle, const char* path)
{
@@ -39,10 +40,7 @@ std::string StrixClawController::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));
}
std::string StrixClawController::GetVersion()

6
Controllers/CherryKeyboardController/CherryKeyboardController.cpp
View File

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

6
Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp
View File

@@ -15,6 +15,7 @@
#include <string>
#include "CorsairLightingNodeController.h"
#include "CorsairDeviceGuard.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -78,10 +79,7 @@ std::string CorsairLightingNodeController::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 CorsairLightingNodeController::SetBrightness(unsigned char brightness)

6
Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.cpp
View File

@@ -9,6 +9,7 @@
#include "CorsairK55RGBPROXTController.h"
#include "LogManager.h"
#include "StringUtils.h"
#define COLOR_BANK_SIZE 137
#define HID_PACKET_LENGTH 65
@@ -70,10 +71,7 @@ std::string CorsairK55RGBPROXTController::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 CorsairK55RGBPROXTController::LightingControl()

6
Controllers/CorsairPeripheralController/CorsairK65MiniController.cpp
View File

@@ -9,6 +9,7 @@
#include "CorsairK65MiniController.h"
#include "LogManager.h"
#include "StringUtils.h"
CorsairK65MiniController::CorsairK65MiniController(hid_device* dev_handle, const char* path)
{
@@ -43,10 +44,7 @@ std::string CorsairK65MiniController::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 CorsairK65MiniController::LightingControl()

6
Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.cpp
View File

@@ -10,6 +10,7 @@
\*---------------------------------------------------------*/
#include "CorsairK95PlatinumXTController.h"
#include "StringUtils.h"
CorsairK95PlatinumXTController::CorsairK95PlatinumXTController(hid_device* dev_handle, const char* path)
{
@@ -49,10 +50,7 @@ std::string CorsairK95PlatinumXTController::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 CorsairK95PlatinumXTController::Init()

6
Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include "CorsairPeripheralController.h"
#include "LogManager.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -133,10 +134,7 @@ std::string CorsairPeripheralController::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 CorsairPeripheralController::SetLEDs(std::vector<RGBColor>colors)

13
Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.cpp
View File

@@ -10,6 +10,7 @@
\*---------------------------------------------------------*/
#include "CorsairPeripheralV2Controller.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -151,21 +152,15 @@ std::string CorsairPeripheralV2Controller::GetName()
std::string CorsairPeripheralV2Controller::GetSerialString()
{
const uint8_t sz = HID_MAX_STR;
wchar_t tmp[sz];
int 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("[%s] Get HID Serial string failed", device_name.c_str());
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));
}
void CorsairPeripheralV2Controller::SetRenderMode(corsair_v2_device_mode mode)

6
Controllers/CorsairWirelessController/CorsairWirelessController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "CorsairWirelessController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -59,10 +60,7 @@ std::string CorsairWirelessController::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 CorsairWirelessController::SetLEDs(std::vector<RGBColor>colors)

14
Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "CougarKeyboardController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -82,20 +83,15 @@ std::string CougarKeyboardController::GetDeviceName()
std::string CougarKeyboardController::GetSerial()
{
const uint8_t sz = HID_MAX_STR;
wchar_t tmp[sz];
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
int ret = hid_get_serial_number_string(dev, tmp, sz);
if (ret != 0)
if(ret != 0)
{
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 CougarKeyboardController::GetLocation()

24
Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp
View File

@@ -11,6 +11,7 @@
#include <string.h>
#include "CougarRevengerSTController.h"
#include "StringUtils.h"
CougarRevengerSTController::CougarRevengerSTController(hid_device* dev_handle, const hid_device_info& info)
{
@@ -18,19 +19,6 @@ CougarRevengerSTController::CougarRevengerSTController(hid_device* dev_handle, c
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());
}
ActivateMode(0, DIRECT_MODE_VALUE);
ActivateMode(1, DIRECT_MODE_VALUE);
ActivateMode(2, DIRECT_MODE_VALUE);
@@ -48,7 +36,15 @@ std::string CougarRevengerSTController::GetDeviceLocation()
std::string CougarRevengerSTController::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 CougarRevengerSTController::GetFirmwareVersion()

1
Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
View File

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

6
Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.cpp
View File

@@ -15,6 +15,7 @@
#include <string>
#include "CryorigH7QuadLumiController.h"
#include "LogManager.h"
#include "StringUtils.h"
CryorigH7QuadLumiController::CryorigH7QuadLumiController(hid_device* dev_handle, const char* path)
{
@@ -49,10 +50,7 @@ std::string CryorigH7QuadLumiController::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 CryorigH7QuadLumiController::SetChannelEffect

0
Controllers/DRGBController/.gitkeep
View File

7
Controllers/DRGBController/DRGBController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "DRGBController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -30,13 +31,13 @@ std::string DRGBController::GetSerialString()
{
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
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));
}
unsigned short DRGBController::GetDevicePID()

29
Controllers/DarkProject/DarkProjectKeyboardController.cpp
View File

@@ -9,8 +9,9 @@
| SPDX-License-Identifier: GPL-2.0-only |
\*---------------------------------------------------------*/
#include "LogManager.h"
#include "DarkProjectKeyboardController.h"
#include "LogManager.h"
#include "StringUtils.h"
static uint8_t packet_map[88] =
{
@@ -57,26 +58,28 @@ DarkProjectKeyboardController::~DarkProjectKeyboardController()
std::string DarkProjectKeyboardController::GetDeviceName()
{
const int szTemp = HID_MAX_STR;
wchar_t tmpName[szTemp];
wchar_t name_string[128];
int ret = hid_get_manufacturer_string(dev, name_string, 128);
hid_get_manufacturer_string(dev, tmpName, szTemp);
std::wstring wName = std::wstring(tmpName);
std::string name = std::string(wName.begin(), wName.end());
if(ret != 0)
{
return("");
}
return name;
return(StringUtils::wstring_to_string(name_string));
}
std::string DarkProjectKeyboardController::GetSerial()
{
const int szTemp = HID_MAX_STR;
wchar_t tmpName[szTemp];
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
hid_get_serial_number_string(dev, tmpName, szTemp);
std::wstring wName = std::wstring(tmpName);
std::string serial = std::string(wName.begin(), wName.end());
if(ret != 0)
{
return("");
}
return serial;
return(StringUtils::wstring_to_string(serial_string));
}
std::string DarkProjectKeyboardController::GetLocation()

18
Controllers/DasKeyboardController/DasKeyboardController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "DasKeyboardController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -36,22 +37,15 @@ std::string DasKeyboardController::GetDeviceLocation()
std::string DasKeyboardController::GetSerialString()
{
wchar_t serial_string[128] = {};
int err = hid_get_serial_number_string(dev, serial_string, 128);
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
std::string return_string;
if(err == 0)
if(ret != 0)
{
std::wstring return_wstring = serial_string;
return_string = std::string(return_wstring.begin(), return_wstring.end());
return("");
}
if(return_string.empty())
{
return_string = version;
}
return(return_string);
return(StringUtils::wstring_to_string(serial_string));
}
std::string DasKeyboardController::GetVersionString()

6
Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "DuckyKeyboardController.h"
#include "StringUtils.h"
DuckyKeyboardController::DuckyKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid)
{
@@ -41,10 +42,7 @@ std::string DuckyKeyboardController::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));
}
unsigned short DuckyKeyboardController::GetUSBPID()

14
Controllers/EVisionKeyboardController/EVisionKeyboardController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include "EVisionKeyboardController.h"
#include "StringUtils.h"
EVisionKeyboardController::EVisionKeyboardController(hid_device* dev_handle, const char* path)
{
@@ -39,10 +40,7 @@ std::string EVisionKeyboardController::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 EVisionKeyboardController::SetKeyboardColors
@@ -64,7 +62,7 @@ void EVisionKeyboardController::SetKeyboardColors
{
packet_size = size;
}
SendKeyboardData
(
&color_data[packet_offset],
@@ -149,7 +147,7 @@ void EVisionKeyboardController::SendKeyboardBegin()
usb_buf[0x01] = EVISION_KB_COMMAND_BEGIN;
usb_buf[0x02] = 0x00;
usb_buf[0x03] = EVISION_KB_COMMAND_BEGIN;
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
@@ -175,7 +173,7 @@ void EVisionKeyboardController::SendKeyboardEnd()
usb_buf[0x01] = EVISION_KB_COMMAND_END;
usb_buf[0x02] = 0x00;
usb_buf[0x03] = EVISION_KB_COMMAND_END;
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
@@ -211,7 +209,7 @@ void EVisionKeyboardController::SendKeyboardData
| Copy in data bytes |
\*-----------------------------------------------------*/
memcpy(&usb_buf[0x08], data, data_size);
/*-----------------------------------------------------*\
| Compute Checksum |
\*-----------------------------------------------------*/

12
Controllers/EVisionKeyboardController/EVisionV2KeyboardController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include "LogManager.h"
#include "EVisionV2KeyboardController.h"
#include "StringUtils.h"
#define BLANK_SPACE 6
#define query_check_buffer(c) \
@@ -102,20 +103,15 @@ std::string EVisionV2KeyboardController::GetDeviceName()
std::string EVisionV2KeyboardController::GetSerial()
{
const uint8_t sz = HID_MAX_STR;
wchar_t tmp[sz];
int 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)
{
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 EVisionV2KeyboardController::GetLocation()

6
Controllers/GaiZongGaiKeyboardController/GaiZhongGaiController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include <thread>
#include "GaiZhongGaiController.h"
#include "StringUtils.h"
/*---------------------------------------------------------------*\
| https://oshwlab.com/yangdsada/GaiZhongGai-Keyboard-68-4PRO |
@@ -172,10 +173,7 @@ std::string GaiZhongGaiKeyboardController::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));
}
std::string GaiZhongGaiKeyboardController::GetVersion()

6
Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp
View File

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

6
Controllers/GigabyteAorusPCCaseController/GigabyteAorusPCCaseController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "GigabyteAorusPCCaseController.h"
#include "StringUtils.h"
GigabyteAorusPCCaseController::GigabyteAorusPCCaseController(hid_device *dev_handle, const char *path)
{
@@ -38,10 +39,7 @@ std::string GigabyteAorusPCCaseController::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 GigabyteAorusPCCaseController::SendColor(uint8_t red, uint8_t green, uint8_t blue)

6
Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HoltekA070Controller.h"
#include "StringUtils.h"
HoltekA070Controller::HoltekA070Controller(hid_device* dev_handle, const char* path)
{
@@ -38,10 +39,7 @@ std::string HoltekA070Controller::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/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HoltekA1FAController.h"
#include "StringUtils.h"
HoltekA1FAController::HoltekA1FAController(hid_device *dev_handle, const char *path)
{
@@ -38,10 +39,7 @@ std::string HoltekA1FAController::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/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXAlloyElite2Controller.h"
#include "StringUtils.h"
/*-----------------------------------------*\
| Skip these indices in the color output |
@@ -43,10 +44,7 @@ std::string HyperXAlloyElite2Controller::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 HyperXAlloyElite2Controller::SetLEDsDirect(const std::vector<RGBColor>& colors)

6
Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXAlloyEliteController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -54,10 +55,7 @@ std::string HyperXAlloyEliteController::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 HyperXAlloyEliteController::SetMode

6
Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXAlloyFPSController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -50,10 +51,7 @@ std::string HyperXAlloyFPSController::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 HyperXAlloyFPSController::SetLEDsDirect(std::vector<RGBColor> colors)

6
Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp
View File

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

6
Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXAlloyOriginsController.h"
#include "StringUtils.h"
// Skip these indices in the color output
static unsigned int skip_idx[] = { 23, 29, 41, 47, 59, 70, 71, 87, 88, 93, 99, 100, 102, 108, 113, 114, 120, 123, 124 };
@@ -41,10 +42,7 @@ std::string HyperXAlloyOriginsController::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 HyperXAlloyOriginsController::SetLEDsDirect(std::vector<RGBColor> colors)

6
Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp
View File

@@ -12,6 +12,7 @@
#include <cstring>
#include "HyperXAlloyOriginsCoreController.h"
#include "StringUtils.h"
// Skip these indices in the color output
static unsigned int skip_idx[] = {6, 7, 14, 15, 22, 23, 30, 31, 38, 39, 44, 46, 47, 54, 55, 58, 60, 61, 62, 63, 70, 71, 78, 79, 86, 87, 94, 95, 101, 102, 103, 109, 110, 111, 118, 119};
@@ -53,10 +54,7 @@ std::string HyperXAlloyOriginsCoreController::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));
}
std::string HyperXAlloyOriginsCoreController::GetFirmwareVersion()

24
Controllers/HyperXMicrophoneController/HyperXMicrophoneController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "HyperXMicrophoneController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -19,19 +20,6 @@ HyperXMicrophoneController::HyperXMicrophoneController(hidapi_wrapper hid_wrappe
wrapper = hid_wrapper;
dev = dev_handle;
location = path;
wchar_t serial_string[128];
int ret = wrapper.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());
}
}
HyperXMicrophoneController::~HyperXMicrophoneController()
@@ -53,7 +41,15 @@ std::string HyperXMicrophoneController::GetDeviceLocation()
std::string HyperXMicrophoneController::GetSerialString()
{
return serial_number;
wchar_t serial_string[128];
int ret = wrapper.hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
return("");
}
return(StringUtils::wstring_to_string(serial_string));
}
void HyperXMicrophoneController::SaveColors(std::vector<RGBColor> colors, unsigned int num_frames)

1
Controllers/HyperXMicrophoneController/HyperXMicrophoneController.h
View File

@@ -34,7 +34,6 @@ private:
hidapi_wrapper wrapper;
hid_device* dev;
std::string location;
std::string serial_number;
std::mutex lock;
void SendEOT(uint8_t frame_count);

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));
}
/*-------------------------------------------------------------------------------------------------*\

6
Controllers/HyperXMousematController/HyperXMousematController.cpp
View File

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

24
Controllers/InstantMouseController/InstantMouseController.cpp
View File

@@ -11,25 +11,13 @@
#include <string.h>
#include "InstantMouseController.h"
#include "StringUtils.h"
InstantMouseController::InstantMouseController(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());
}
}
InstantMouseController::~InstantMouseController()
@@ -44,7 +32,15 @@ std::string InstantMouseController::GetDeviceLocation()
std::string InstantMouseController::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 InstantMouseController::GetFirmwareVersion()

1
Controllers/InstantMouseController/InstantMouseController.h
View File

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

6
Controllers/IntelArcA770LEController/IntelArcA770LEController.cpp
View File

@@ -14,6 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "IntelArcA770LEController.h"
#include "StringUtils.h"
IntelArcA770LEController::IntelArcA770LEController(hid_device* dev_handle, const char* path)
{
@@ -41,10 +42,7 @@ std::string IntelArcA770LEController::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));
}
std::string IntelArcA770LEController::GetFirmwareVersionString()

24
Controllers/KeychronKeyboardController/KeychronKeyboardController.cpp
View File

@@ -11,6 +11,7 @@
#include <string.h>
#include "KeychronKeyboardController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -19,19 +20,6 @@ KeychronKeyboardController::KeychronKeyboardController(hid_device* dev_handle, c
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());
}
}
KeychronKeyboardController::~KeychronKeyboardController()
@@ -46,7 +34,15 @@ std::string KeychronKeyboardController::GetDeviceLocation()
std::string KeychronKeyboardController::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 KeychronKeyboardController::GetFirmwareVersion()

1
Controllers/KeychronKeyboardController/KeychronKeyboardController.h
View File

@@ -106,7 +106,6 @@ protected:
private:
std::string location;
std::string serial_number;
std::string version;
std::vector<unsigned int> led_sequence_positions;

24
Controllers/LGMonitorController/LGMonitorController.cpp
View File

@@ -11,25 +11,13 @@
#include <string.h>
#include "LGMonitorController.h"
#include "StringUtils.h"
LGMonitorController::LGMonitorController(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());
}
}
LGMonitorController::~LGMonitorController()
@@ -44,7 +32,15 @@ std::string LGMonitorController::GetDeviceLocation()
std::string LGMonitorController::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 LGMonitorController::GetFirmwareVersion()

1
Controllers/LGMonitorController/LGMonitorController.h
View File

@@ -59,7 +59,6 @@ private:
std::string description;
std::string location;
std::string version;
std::string serial_number;
bool on = false;
bool direct_mode_enabled = false;

24
Controllers/LegoDimensionsToypadBaseController/LegoDimensionsToypadBaseController.cpp
View File

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

1
Controllers/LegoDimensionsToypadBaseController/LegoDimensionsToypadBaseController.h
View File

@@ -50,7 +50,6 @@ protected:
private:
std::string location;
std::string serial_number;
std::string version;
void Activate();

24
Controllers/LenovoMotherboardController/LenovoMotherboardController.cpp
View File

@@ -11,25 +11,13 @@
#include <string.h>
#include "LenovoMotherboardController.h"
#include "StringUtils.h"
LenovoMotherboardController::LenovoMotherboardController(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());
}
}
LenovoMotherboardController::~LenovoMotherboardController()
@@ -44,7 +32,15 @@ std::string LenovoMotherboardController::GetDeviceLocation()
std::string LenovoMotherboardController::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 LenovoMotherboardController::GetFirmwareVersion()

1
Controllers/LenovoMotherboardController/LenovoMotherboardController.h
View File

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

25
Controllers/LexipMouseController/LexipMouseController.cpp
View File

@@ -11,26 +11,13 @@
#include <string.h>
#include "LexipMouseController.h"
#include "StringUtils.h"
LexipMouseController::LexipMouseController(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());
}
}
LexipMouseController::~LexipMouseController()
@@ -45,7 +32,15 @@ std::string LexipMouseController::GetDeviceLocation()
std::string LexipMouseController::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 LexipMouseController::GetFirmwareVersion()

1
Controllers/LexipMouseController/LexipMouseController.h
View File

@@ -33,6 +33,5 @@ protected:
private:
std::string location;
std::string serial_number;
std::string version;
};

21
Controllers/LightSaltController/LightSaltController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "LightSaltController.h"
#include "StringUtils.h"
static const int mode_map[LIGHTSALT_MODE_MAXIMUM][6] =
{
@@ -41,16 +42,6 @@ LightSaltController::LightSaltController(hid_device* dev_handle, const hid_devic
dev = dev_handle;
device_location = info.path;
if(hid_get_serial_number_string(dev, usb_string, 128) == 0)
{
std::wstring tmp_wstring = usb_string;
serial = std::string(tmp_wstring.begin(), tmp_wstring.end());
}
else
{
serial = "";
}
if(hid_get_manufacturer_string(dev, usb_string, 128) == 0)
{
std::wstring tmp_wstring = usb_string;
@@ -98,7 +89,15 @@ std::string LightSaltController::GetDeviceLocation()
std::string LightSaltController::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 LightSaltController::GetManufacturer()

1
Controllers/LightSaltController/LightSaltController.h
View File

@@ -96,7 +96,6 @@ private:
hid_device* dev;
std::string device_location;
std::string serial;
std::string manufacturer;
std::string product;
std::string device_model;

6
Controllers/MSI3ZoneController/MSI3ZoneController.cpp
View File

@@ -10,6 +10,7 @@
\*---------------------------------------------------------*/
#include "MSI3ZoneController.h"
#include "StringUtils.h"
MSI3ZoneController::MSI3ZoneController(hid_device* dev_handle, const char* path)
{
@@ -44,10 +45,7 @@ std::string MSI3ZoneController::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 MSI3ZoneController::SetLEDs(std::vector<RGBColor> colors)

28
Controllers/MSIMysticLightController/MSIMysticLight112Controller/MSIMysticLight112Controller.cpp
View File

@@ -13,6 +13,7 @@
#include <array>
#include <bitset>
#include "MSIMysticLight112Controller.h"
#include "StringUtils.h"
#define BITSET(val, bit, pos) ((unsigned char)std::bitset<8>(val).set((pos), (bit)).to_ulong())
@@ -45,7 +46,6 @@ MSIMysticLight112Controller::MSIMysticLight112Controller
location = path;
ReadName();
ReadSerial();
ReadFwVersion();
ReadSettings();
}
@@ -158,7 +158,15 @@ std::string MSIMysticLight112Controller::GetDeviceLocation()
std::string MSIMysticLight112Controller::GetSerial()
{
return chip_id;
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));
}
bool MSIMysticLight112Controller::ReadSettings()
@@ -377,22 +385,6 @@ bool MSIMysticLight112Controller::ReadFwVersion()
return(ret_val > 0);
}
void MSIMysticLight112Controller::ReadSerial()
{
wchar_t serial[256];
/*-----------------------------------------------------*\
| Get the serial number string from HID |
\*-----------------------------------------------------*/
hid_get_serial_number_string(dev, serial, 256);
/*-----------------------------------------------------*\
| Convert wchar_t into std::wstring into std::string |
\*-----------------------------------------------------*/
std::wstring wserial = std::wstring(serial);
chip_id = std::string(wserial.begin(), wserial.end());
}
void MSIMysticLight112Controller::ReadName()
{
wchar_t tname[256];

2
Controllers/MSIMysticLightController/MSIMysticLight112Controller/MSIMysticLight112Controller.h
View File

@@ -90,7 +90,6 @@ public:
private:
bool ReadSettings();
bool ReadFwVersion();
void ReadSerial();
void ReadName();
ZoneData* GetZoneData
(
@@ -103,7 +102,6 @@ private:
std::string location;
std::string version_APROM;
std::string version_LDROM;
std::string chip_id;
FeaturePacket_112 data;
FeaturePacket_112 zone_based_per_led_data;

28
Controllers/MSIMysticLightController/MSIMysticLight162Controller/MSIMysticLight162Controller.cpp
View File

@@ -14,6 +14,7 @@
#include <array>
#include <bitset>
#include "MSIMysticLight162Controller.h"
#include "StringUtils.h"
#define BITSET(val, bit, pos) ((unsigned char)std::bitset<8>(val).set((pos), (bit)).to_ulong())
@@ -93,7 +94,6 @@ MSIMysticLight162Controller::MSIMysticLight162Controller
location = path;
ReadName();
ReadSerial();
ReadFwVersion();
ReadSettings();
}
@@ -204,7 +204,15 @@ std::string MSIMysticLight162Controller::GetDeviceLocation()
std::string MSIMysticLight162Controller::GetSerial()
{
return chip_id;
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));
}
bool MSIMysticLight162Controller::ReadSettings()
@@ -400,22 +408,6 @@ bool MSIMysticLight162Controller::ReadFwVersion()
return(ret_val > 0);
}
void MSIMysticLight162Controller::ReadSerial()
{
wchar_t serial[256];
/*-----------------------------------------------------*\
| Get the serial number string from HID |
\*-----------------------------------------------------*/
hid_get_serial_number_string(dev, serial, 256);
/*-----------------------------------------------------*\
| Convert wchar_t into std::wstring into std::string |
\*-----------------------------------------------------*/
std::wstring wserial = std::wstring(serial);
chip_id = std::string(wserial.begin(), wserial.end());
}
void MSIMysticLight162Controller::ReadName()
{
wchar_t tname[256];

2
Controllers/MSIMysticLightController/MSIMysticLight162Controller/MSIMysticLight162Controller.h
View File

@@ -78,7 +78,6 @@ public:
private:
bool ReadSettings();
bool ReadFwVersion();
void ReadSerial();
void ReadName();
ZoneData* GetZoneData
(
@@ -91,7 +90,6 @@ private:
std::string location;
std::string version_APROM;
std::string version_LDROM;
std::string chip_id;
FeaturePacket_162 data;
size_t numof_onboard_leds;

30
Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp
View File

@@ -19,6 +19,7 @@
#include <array>
#include <bitset>
#include "MSIMysticLight185Controller.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -343,14 +344,13 @@ MSIMysticLight185Controller::MSIMysticLight185Controller
location = path;
ReadName();
ReadSerial();
ReadFwVersion();
ReadSettings();
}
if(pid == MSI_USB_PID_COMMON)
{
std::string pidStr(chip_id.substr(0, 4));
std::string pidStr(GetSerial().substr(0, 4));
pid = std::stoi(pidStr, nullptr, 16);
}
@@ -622,7 +622,15 @@ std::string MSIMysticLight185Controller::GetDeviceLocation()
std::string MSIMysticLight185Controller::GetSerial()
{
return chip_id;
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));
}
bool MSIMysticLight185Controller::ReadSettings()
@@ -1034,22 +1042,6 @@ bool MSIMysticLight185Controller::ReadFwVersion()
return (ret_val > 0);
}
void MSIMysticLight185Controller::ReadSerial()
{
wchar_t serial[256];
/*-----------------------------------------------------*\
| Get the serial number string from HID |
\*-----------------------------------------------------*/
hid_get_serial_number_string(dev, serial, 256);
/*-----------------------------------------------------*\
| Convert wchar_t into std::wstring into std::string |
\*-----------------------------------------------------*/
std::wstring wserial = std::wstring(serial);
chip_id = std::string(wserial.begin(), wserial.end());
}
void MSIMysticLight185Controller::ReadName()
{
wchar_t tname[256];

2
Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h
View File

@@ -115,7 +115,6 @@ public:
private:
bool ReadSettings();
bool ReadFwVersion();
void ReadSerial();
void ReadName();
ZoneData* GetZoneData
(
@@ -134,7 +133,6 @@ private:
std::string location;
std::string version_APROM;
std::string version_LDROM;
std::string chip_id;
FeaturePacket_185 data;
FeaturePacket_PerLED_185 per_led_data_onboard_and_sync;

19
Controllers/MSIMysticLightController/MSIMysticLight64Controller/MSIMysticLight64Controller.cpp
View File

@@ -15,6 +15,7 @@
#include <array>
#include <bitset>
#include "MSIMysticLight64Controller.h"
#include "StringUtils.h"
MSIMysticLight64Controller::MSIMysticLight64Controller
(
@@ -103,17 +104,13 @@ std::string MSIMysticLight64Controller::GetDeviceLocation()
std::string MSIMysticLight64Controller::GetSerial()
{
wchar_t serial[256];
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
/*-----------------------------------------------------*\
| Get the serial number string from HID |
\*-----------------------------------------------------*/
hid_get_serial_number_string(dev, serial, 256);
if(ret != 0)
{
return("");
}
/*-----------------------------------------------------*\
| Convert wchar_t into std::wstring into std::string |
\*-----------------------------------------------------*/
std::wstring wserial = std::wstring(serial);
return (std::string(wserial.begin(), wserial.end()));
return(StringUtils::wstring_to_string(serial_string));
}

25
Controllers/MSIOptixController/MSIOptixController.cpp
View File

@@ -11,26 +11,13 @@
#include <string.h>
#include "MSIOptixController.h"
#include "StringUtils.h"
MSIOptixController::MSIOptixController(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());
}
}
MSIOptixController::~MSIOptixController()
@@ -45,7 +32,15 @@ std::string MSIOptixController::GetDeviceLocation()
std::string MSIOptixController::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 MSIOptixController::GetFirmwareVersion()

1
Controllers/MSIOptixController/MSIOptixController.h
View File

@@ -82,7 +82,6 @@ protected:
private:
std::string location;
std::string serial_number;
std::string version;
unsigned char GetMysteriousFlag(unsigned char mode_value);

25
Controllers/MSIVigorController/MSIVigorGK30Controller.cpp
View File

@@ -12,6 +12,7 @@
#include <cmath>
#include <string.h>
#include "MSIVigorGK30Controller.h"
#include "StringUtils.h"
static unsigned char argb_colour_index_data[2][2][2] =
{ //B0 B1
@@ -26,20 +27,6 @@ MSIVigorGK30Controller::MSIVigorGK30Controller(hid_device* dev_handle, const hid
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());
}
}
MSIVigorGK30Controller::~MSIVigorGK30Controller()
@@ -54,7 +41,15 @@ std::string MSIVigorGK30Controller::GetDeviceLocation()
std::string MSIVigorGK30Controller::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 MSIVigorGK30Controller::GetFirmwareVersion()

6
Controllers/MountainKeyboardController/MountainKeyboardController.cpp
View File

@@ -13,6 +13,7 @@
#include <cstring>
#include <thread>
#include "MountainKeyboardController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -42,10 +43,7 @@ std::string MountainKeyboardController::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 MountainKeyboardController::SelectMode(unsigned char mode_idx)

26
Controllers/N5312AController/N5312AController.cpp
View File

@@ -10,8 +10,9 @@
\*---------------------------------------------------------*/
#include <string.h>
#include "N5312AController.h"
#include "LogManager.h"
#include "N5312AController.h"
#include "StringUtils.h"
N5312AController::N5312AController(hid_device* dev_handle, const hid_device_info& info)
{
@@ -19,19 +20,6 @@ N5312AController::N5312AController(hid_device* dev_handle, const hid_device_info
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 N5312AController::GetDeviceLocation()
std::string N5312AController::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 N5312AController::GetFirmwareVersion()

1
Controllers/N5312AController/N5312AController.h
View File

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

6
Controllers/NZXTHue1Controller/NZXTHue1Controller.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "NZXTHue1Controller.h"
#include "StringUtils.h"
NZXTHue1Controller::NZXTHue1Controller(hid_device* dev_handle, unsigned int /*fan_channels*/, const char* path)
{
@@ -45,10 +46,7 @@ std::string NZXTHue1Controller::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));
}
unsigned int NZXTHue1Controller::GetAccessoryType()

8
Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp
View File

@@ -13,8 +13,9 @@
#include <fstream>
#include <iostream>
#include <string>
#include "NZXTHue2Controller.h"
#include "LogManager.h"
#include "NZXTHue2Controller.h"
#include "StringUtils.h"
NZXTHue2Controller::NZXTHue2Controller(hid_device* dev_handle, unsigned int rgb_channels, unsigned int fan_channels, const char* path)
{
@@ -83,10 +84,7 @@ std::string NZXTHue2Controller::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 NZXTHue2Controller::SendFan

6
Controllers/NZXTKrakenController/NZXTKrakenController.cpp
View File

@@ -13,6 +13,7 @@
#include <string>
#include <sstream>
#include "NZXTKrakenController.h"
#include "StringUtils.h"
static void SetColor(const std::vector<RGBColor>& colors, unsigned char* color_data)
{
@@ -67,10 +68,7 @@ std::string NZXTKrakenController::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 NZXTKrakenController::UpdateStatus()

6
Controllers/NZXTMouseController/NZXTMouseController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "NZXTMouseController.h"
#include "StringUtils.h"
NZXTMouseController::NZXTMouseController(hid_device* dev_handle, const char* path)
{
@@ -48,10 +49,7 @@ std::string NZXTMouseController::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 NZXTMouseController::SetLEDs

6
Controllers/NollieController/NollieController.cpp
View File

@@ -11,7 +11,7 @@
#include <cstring>
#include "NollieController.h"
#include "RGBController_Nollie.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@@ -37,9 +37,7 @@ std::string NollieController::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));
}
unsigned short NollieController::GetUSBPID()

33
Controllers/NollieController/NollieController.h
View File

@@ -16,6 +16,39 @@
#include <hidapi/hidapi.h>
#include "RGBController.h"
#define NOLLIE_12_CH_LED_NUM 42
#define NOLLIE_8_CH_LED_NUM 126
#define NOLLIE_1_CH_LED_NUM 630
#define NOLLIE_HS_CH_LED_NUM 256
#define NOLLIE_FS_CH_LED_NUM 525
#define NOLLIE32_CHANNELS_NUM 32
#define NOLLIE32_PID 0x4714
#define NOLLIE32_VID 0x3061
#define NOLLIE16_CHANNELS_NUM 16
#define NOLLIE16_PID 0x4716
#define NOLLIE16_VID 0x3061
#define NOLLIE8_CHANNELS_NUM 8
#define NOLLIE8_PID 0x1F01
#define NOLLIE8_VID 0x16D2
#define NOLLIE1_CHANNELS_NUM 1
#define NOLLIE1_PID 0x1F11
#define NOLLIE1_VID 0x16D2
#define NOLLIE28_12_CHANNELS_NUM 12
#define NOLLIE28_12_VID 0x16D2
#define NOLLIE28_12_PID 0x1616
#define NOLLIE28_L1_PID 0x1617
#define NOLLIE28_L2_PID 0x1618
#define NOLLIE32_MOS_TRIGGER_CH 26
#define NOLLIE32_MOS_TRIGGER_LED 20
#define NOLLIE32_FLAG1_CHANNEL 15
#define NOLLIE32_FLAG2_CHANNEL 31
class NollieController
{
public:

34
Controllers/NollieController/RGBController_Nollie.h
View File

@@ -14,40 +14,6 @@
#include "RGBController.h"
#include "NollieController.h"
#define NOLLIE_12_CH_LED_NUM 42
#define NOLLIE_8_CH_LED_NUM 126
#define NOLLIE_1_CH_LED_NUM 630
#define NOLLIE_HS_CH_LED_NUM 256
#define NOLLIE_FS_CH_LED_NUM 525
#define NOLLIE32_CHANNELS_NUM 32
#define NOLLIE32_PID 0x4714
#define NOLLIE32_VID 0x3061
#define NOLLIE16_CHANNELS_NUM 16
#define NOLLIE16_PID 0x4716
#define NOLLIE16_VID 0x3061
#define NOLLIE8_CHANNELS_NUM 8
#define NOLLIE8_PID 0x1F01
#define NOLLIE8_VID 0x16D2
#define NOLLIE1_CHANNELS_NUM 1
#define NOLLIE1_PID 0x1F11
#define NOLLIE1_VID 0x16D2
#define NOLLIE28_12_CHANNELS_NUM 12
#define NOLLIE28_12_VID 0x16D2
#define NOLLIE28_12_PID 0x1616
#define NOLLIE28_L1_PID 0x1617
#define NOLLIE28_L2_PID 0x1618
#define NOLLIE32_MOS_TRIGGER_CH 26
#define NOLLIE32_MOS_TRIGGER_LED 20
#define NOLLIE32_FLAG1_CHANNEL 15
#define NOLLIE32_FLAG2_CHANNEL 31
class RGBController_Nollie : public RGBController
{
public:

25
Controllers/NvidiaESAController/NvidiaESAController.cpp
View File

@@ -11,26 +11,13 @@
#include <string.h>
#include "NvidiaESAController.h"
#include "StringUtils.h"
NvidiaESAController::NvidiaESAController(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());
}
}
NvidiaESAController::~NvidiaESAController()
@@ -45,7 +32,15 @@ std::string NvidiaESAController::GetDeviceLocation()
std::string NvidiaESAController::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 NvidiaESAController::GetFirmwareVersion()

1
Controllers/NvidiaESAController/NvidiaESAController.h
View File

@@ -32,6 +32,5 @@ protected:
private:
std::string location;
std::string serial_number;
std::string version;
};

6
Controllers/OKSController/OKSKeyboardController.cpp
View File

@@ -11,6 +11,7 @@
#include <cstring>
#include "OKSKeyboardController.h"
#include "StringUtils.h"
OKSKeyboardController::OKSKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid)
{
@@ -41,10 +42,7 @@ std::string OKSKeyboardController::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));
}
unsigned short OKSKeyboardController::GetUSBPID()

6
Controllers/RedragonController/RedragonMouseController.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More