Skip to content

Commit d19baf1

Browse files
Fill in serial field for all HID controllers using hidapi
1 parent 92dc841 commit d19baf1

101 files changed

Lines changed: 446 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,17 @@ char* AMDWraithPrismController::GetDeviceName()
4949
return device_name;
5050
}
5151

52+
std::string AMDWraithPrismController::GetSerialString()
53+
{
54+
wchar_t serial_string[128];
55+
hid_get_serial_number_string(dev, serial_string, 128);
56+
57+
std::wstring return_wstring = serial_string;
58+
std::string return_string(return_wstring.begin(), return_wstring.end());
59+
60+
return(return_string);
61+
}
62+
5263
std::string AMDWraithPrismController::GetEffectChannelString(unsigned char channel)
5364
{
5465
std::string ret_string = "";

Controllers/AMDWraithPrismController/AMDWraithPrismController.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ class AMDWraithPrismController
117117
std::string GetEffectChannelString(unsigned char channel);
118118
std::string GetFirmwareVersionString();
119119
std::string GetLocationString();
120+
std::string GetSerialString();
120121

121122
void SetRingEffectChannel(unsigned char channel);
122123

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
1919
description = "AMD Wraith Prism Device";
2020
version = wraith->GetFirmwareVersionString();
2121
location = wraith->GetLocationString();
22+
serial = wraith->GetSerialString();
2223

2324
mode Direct;
2425
Direct.name = "Direct";

Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,17 @@ std::string AuraCoreController::GetDeviceLocation()
2626
return("HID: " + location);
2727
}
2828

29+
std::string AuraCoreController::GetSerialString()
30+
{
31+
wchar_t serial_string[128];
32+
hid_get_serial_number_string(dev, serial_string, 128);
33+
34+
std::wstring return_wstring = serial_string;
35+
std::string return_string(return_wstring.begin(), return_wstring.end());
36+
37+
return(return_string);
38+
}
39+
2940
void AuraCoreController::SendBrightness
3041
(
3142
unsigned char brightness

Controllers/AsusAuraCoreController/AsusAuraCoreController.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class AuraCoreController
5252
~AuraCoreController();
5353

5454
std::string GetDeviceLocation();
55+
std::string GetSerialString();
5556

5657
void SendBrightness
5758
(

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr)
1717
type = DEVICE_TYPE_KEYBOARD;
1818
description = "ASUS Aura Core Device";
1919
location = aura->GetDeviceLocation();
20+
serial = aura->GetSerialString();
2021

2122
mode Static;
2223
Static.name = "Static";

Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ std::string AuraMouseController::GetDeviceLocation()
2727
return("HID: " + location);
2828
}
2929

30+
std::string AuraMouseController::GetSerialString()
31+
{
32+
wchar_t serial_string[128];
33+
hid_get_serial_number_string(dev, serial_string, 128);
34+
35+
std::wstring return_wstring = serial_string;
36+
std::string return_string(return_wstring.begin(), return_wstring.end());
37+
38+
return(return_string);
39+
}
40+
3041
void AuraMouseController::SendUpdate
3142
(
3243
unsigned char zone,

Controllers/AsusAuraUSBController/AsusAuraMouseController.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class AuraMouseController
3838
virtual ~AuraMouseController();
3939

4040
std::string GetDeviceLocation();
41+
std::string GetSerialString();
4142

4243
void SendUpdate
4344
(

Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ std::string AuraUSBController::GetDeviceName()
4040
return(device_name);
4141
}
4242

43+
std::string AuraUSBController::GetSerialString()
44+
{
45+
wchar_t serial_string[128];
46+
hid_get_serial_number_string(dev, serial_string, 128);
47+
48+
std::wstring return_wstring = serial_string;
49+
std::string return_string(return_wstring.begin(), return_wstring.end());
50+
51+
return(return_string);
52+
}
53+
4354
const std::vector<AuraDeviceInfo>& AuraUSBController::GetAuraDevices() const
4455
{
4556
return(device_info);

Controllers/AsusAuraUSBController/AsusAuraUSBController.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class AuraUSBController
6666

6767
std::string GetDeviceLocation();
6868
std::string GetDeviceName();
69+
std::string GetSerialString();
6970

7071
const std::vector<AuraDeviceInfo>& GetAuraDevices() const;
7172

0 commit comments

Comments
 (0)