Skip to content

Commit c82a605

Browse files
CalcProgrammer1CalcProgrammer1
committed
Store name in AsusAuraUSBControllers to avoid setting it in detectors
1 parent a0726dc commit c82a605

40 files changed

Lines changed: 669 additions & 589 deletions

File tree

‎Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
#include "AsusAuraHeadsetStandController.h"
1414
#include "StringUtils.h"
1515

16-
AuraHeadsetStandController::AuraHeadsetStandController(hid_device* dev_handle, const char* path)
16+
AuraHeadsetStandController::AuraHeadsetStandController(hid_device* dev_handle, const char* path, std::string dev_name)
1717
{
1818
dev = dev_handle;
1919
location = path;
20+
name = dev_name;
2021
}
2122

2223
AuraHeadsetStandController::~AuraHeadsetStandController()
@@ -29,6 +30,11 @@ std::string AuraHeadsetStandController::GetDeviceLocation()
2930
return("HID: " + location);
3031
}
3132

33+
std::string AuraHeadsetStandController::GetName()
34+
{
35+
return(name);
36+
}
37+
3238
std::string AuraHeadsetStandController::GetSerialString()
3339
{
3440
wchar_t serial_string[128];

‎Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,33 @@ enum
3333
class AuraHeadsetStandController
3434
{
3535
public:
36-
AuraHeadsetStandController(hid_device* dev_handle, const char* path);
36+
AuraHeadsetStandController(hid_device* dev_handle, const char* path, std::string dev_name);
3737
virtual ~AuraHeadsetStandController();
3838

3939
std::string GetDeviceLocation();
40+
std::string GetName();
4041
std::string GetSerialString();
4142
std::string GetVersion();
4243

43-
void UpdateLeds
44-
(
45-
std::vector<RGBColor> colors
46-
);
44+
void UpdateLeds
45+
(
46+
std::vector<RGBColor> colors
47+
);
4748

48-
void UpdateDevice
49-
(
50-
unsigned char mode,
51-
unsigned char red,
52-
unsigned char grn,
53-
unsigned char blu,
54-
unsigned char speed,
55-
unsigned char brightness
56-
);
49+
void UpdateDevice
50+
(
51+
unsigned char mode,
52+
unsigned char red,
53+
unsigned char grn,
54+
unsigned char blu,
55+
unsigned char speed,
56+
unsigned char brightness
57+
);
5758

58-
void SaveMode();
59+
void SaveMode();
5960

6061
private:
61-
hid_device* dev;
62-
std::string location;
62+
hid_device* dev;
63+
std::string location;
64+
std::string name;
6365
};

‎Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.cpp‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -24,88 +24,88 @@
2424

2525
RGBController_AuraHeadsetStand::RGBController_AuraHeadsetStand(AuraHeadsetStandController* controller_ptr)
2626
{
27-
controller = controller_ptr;
27+
controller = controller_ptr;
2828

29-
name = "ASUS Aura Headset Stand";
30-
vendor = "ASUS";
31-
type = DEVICE_TYPE_HEADSET_STAND;
32-
description = "ASUS Aura Headset Stand Device";
33-
version = controller->GetVersion();
34-
location = controller->GetDeviceLocation();
35-
serial = controller->GetSerialString();
29+
name = controller->GetName();
30+
vendor = "ASUS";
31+
type = DEVICE_TYPE_HEADSET_STAND;
32+
description = "ASUS Aura Headset Stand Device";
33+
version = controller->GetVersion();
34+
location = controller->GetDeviceLocation();
35+
serial = controller->GetSerialString();
3636

3737
mode Direct;
38-
Direct.name = "Direct";
39-
Direct.value = AURA_HEADSET_STAND_MODE_DIRECT;
40-
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR;
41-
Direct.color_mode = MODE_COLORS_PER_LED;
38+
Direct.name = "Direct";
39+
Direct.value = AURA_HEADSET_STAND_MODE_DIRECT;
40+
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR;
41+
Direct.color_mode = MODE_COLORS_PER_LED;
4242
modes.push_back(Direct);
4343

4444
mode Static;
45-
Static.name = "Static";
46-
Static.value = AURA_HEADSET_STAND_MODE_STATIC;
47-
Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
48-
Static.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
49-
Static.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
50-
Static.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
51-
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
52-
Static.colors_min = 1;
53-
Static.colors_max = 1;
45+
Static.name = "Static";
46+
Static.value = AURA_HEADSET_STAND_MODE_STATIC;
47+
Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
48+
Static.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
49+
Static.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
50+
Static.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
51+
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
52+
Static.colors_min = 1;
53+
Static.colors_max = 1;
5454
Static.colors.resize(1);
5555
modes.push_back(Static);
5656

5757
mode Breathing;
58-
Breathing.name = "Breathing";
59-
Breathing.value = AURA_HEADSET_STAND_MODE_BREATHING;
60-
Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
61-
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
62-
Breathing.speed_min = AURA_HEADSETSTAND_SPEED_MIN;
63-
Breathing.speed_max = AURA_HEADSETSTAND_SPEED_MAX;
64-
Breathing.speed = AURA_HEADSETSTAND_SPEED_DEFAULT;
65-
Breathing.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
66-
Breathing.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
67-
Breathing.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
68-
Breathing.colors_min = 1;
69-
Breathing.colors_max = 1;
58+
Breathing.name = "Breathing";
59+
Breathing.value = AURA_HEADSET_STAND_MODE_BREATHING;
60+
Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
61+
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
62+
Breathing.speed_min = AURA_HEADSETSTAND_SPEED_MIN;
63+
Breathing.speed_max = AURA_HEADSETSTAND_SPEED_MAX;
64+
Breathing.speed = AURA_HEADSETSTAND_SPEED_DEFAULT;
65+
Breathing.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
66+
Breathing.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
67+
Breathing.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
68+
Breathing.colors_min = 1;
69+
Breathing.colors_max = 1;
7070
Breathing.colors.resize(1);
7171
modes.push_back(Breathing);
7272

7373
mode Strobing;
74-
Strobing.name = "Flashing";
75-
Strobing.value = AURA_HEADSET_STAND_MODE_STROBING;
76-
Strobing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
77-
Strobing.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
78-
Strobing.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
79-
Strobing.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
80-
Strobing.color_mode = MODE_COLORS_MODE_SPECIFIC;
81-
Strobing.colors_min = 1;
82-
Strobing.colors_max = 1;
74+
Strobing.name = "Flashing";
75+
Strobing.value = AURA_HEADSET_STAND_MODE_STROBING;
76+
Strobing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
77+
Strobing.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
78+
Strobing.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
79+
Strobing.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
80+
Strobing.color_mode = MODE_COLORS_MODE_SPECIFIC;
81+
Strobing.colors_min = 1;
82+
Strobing.colors_max = 1;
8383
Strobing.colors.resize(1);
8484
modes.push_back(Strobing);
8585

8686
mode SpectrumCycle;
87-
SpectrumCycle.name = "Spectrum Cycle";
88-
SpectrumCycle.value = AURA_HEADSET_STAND_MODE_COLOR_CYCLE;
89-
SpectrumCycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
90-
SpectrumCycle.speed_min = AURA_HEADSETSTAND_SPEED_MIN;
91-
SpectrumCycle.speed_max = AURA_HEADSETSTAND_SPEED_MAX;
92-
SpectrumCycle.speed = AURA_HEADSETSTAND_SPEED_DEFAULT;
93-
SpectrumCycle.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
94-
SpectrumCycle.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
95-
SpectrumCycle.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
96-
SpectrumCycle.color_mode = MODE_COLORS_NONE;
87+
SpectrumCycle.name = "Spectrum Cycle";
88+
SpectrumCycle.value = AURA_HEADSET_STAND_MODE_COLOR_CYCLE;
89+
SpectrumCycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
90+
SpectrumCycle.speed_min = AURA_HEADSETSTAND_SPEED_MIN;
91+
SpectrumCycle.speed_max = AURA_HEADSETSTAND_SPEED_MAX;
92+
SpectrumCycle.speed = AURA_HEADSETSTAND_SPEED_DEFAULT;
93+
SpectrumCycle.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
94+
SpectrumCycle.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
95+
SpectrumCycle.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
96+
SpectrumCycle.color_mode = MODE_COLORS_NONE;
9797
modes.push_back(SpectrumCycle);
9898

9999
mode Rainbow;
100-
Rainbow.name = "Rainbow Wave";
101-
Rainbow.value = AURA_HEADSET_STAND_MODE_RAINBOW;
102-
Rainbow.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
103-
Rainbow.speed_min = AURA_HEADSETSTAND_SPEED_MIN;
104-
Rainbow.speed_max = AURA_HEADSETSTAND_SPEED_MAX;
105-
Rainbow.speed = AURA_HEADSETSTAND_SPEED_DEFAULT;
106-
Rainbow.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
107-
Rainbow.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
108-
Rainbow.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
100+
Rainbow.name = "Rainbow Wave";
101+
Rainbow.value = AURA_HEADSET_STAND_MODE_RAINBOW;
102+
Rainbow.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE;
103+
Rainbow.speed_min = AURA_HEADSETSTAND_SPEED_MIN;
104+
Rainbow.speed_max = AURA_HEADSETSTAND_SPEED_MAX;
105+
Rainbow.speed = AURA_HEADSETSTAND_SPEED_DEFAULT;
106+
Rainbow.brightness_min = AURA_HEADSETSTAND_BRIGHTNESS_MIN;
107+
Rainbow.brightness_max = AURA_HEADSETSTAND_BRIGHTNESS_MAX;
108+
Rainbow.brightness = AURA_HEADSETSTAND_BRIGHTNESS_DEFAULT;
109109
modes.push_back(Rainbow);
110110
SetupZones();
111111
}

‎Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
#include "AsusAuraKeyboardController.h"
1414
#include "StringUtils.h"
1515

16-
AuraKeyboardController::AuraKeyboardController(hid_device* dev_handle, const char* path)
16+
AuraKeyboardController::AuraKeyboardController(hid_device* dev_handle, const char* path, std::string dev_name)
1717
{
1818
dev = dev_handle;
1919
location = path;
20+
name = dev_name;
2021
}
2122

2223
AuraKeyboardController::~AuraKeyboardController()
@@ -29,6 +30,11 @@ std::string AuraKeyboardController::GetDeviceLocation()
2930
return("HID: " + location);
3031
}
3132

33+
std::string AuraKeyboardController::GetNameString()
34+
{
35+
return(name);
36+
}
37+
3238
std::string AuraKeyboardController::GetSerialString()
3339
{
3440
wchar_t serial_string[128];

‎Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.h‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
class AuraKeyboardController
2020
{
2121
public:
22-
AuraKeyboardController(hid_device* dev_handle, const char* path);
22+
AuraKeyboardController(hid_device* dev_handle, const char* path, std::string dev_name);
2323
virtual ~AuraKeyboardController();
2424

2525
std::string GetDeviceLocation();
26+
std::string GetNameString();
2627
std::string GetSerialString();
2728

28-
void SendDirect
29-
(
30-
unsigned char frame_count,
31-
unsigned char * frame_data
32-
);
29+
void SendDirect
30+
(
31+
unsigned char frame_count,
32+
unsigned char * frame_data
33+
);
3334

3435
private:
35-
hid_device* dev;
36-
std::string location;
36+
hid_device* dev;
37+
std::string location;
38+
std::string name;
3739
};

‎Controllers/AsusAuraUSBController/AsusAuraKeyboardController/RGBController_AsusAuraKeyboard.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -358,21 +358,21 @@ static const std::vector<aura_keyboard_led> default_65pct_led_names =
358358

359359
RGBController_AuraKeyboard::RGBController_AuraKeyboard(AuraKeyboardController* controller_ptr, AuraKeyboardMappingLayoutType keyboard_layout)
360360
{
361-
controller = controller_ptr;
362-
layout = keyboard_layout;
361+
controller = controller_ptr;
362+
layout = keyboard_layout;
363363

364-
name = "ASUS Aura Keyboard";
365-
vendor = "ASUS";
366-
type = DEVICE_TYPE_KEYBOARD;
367-
description = "ASUS Aura Keyboard Device";
368-
location = controller->GetDeviceLocation();
369-
serial = controller->GetSerialString();
364+
name = controller->GetNameString();
365+
vendor = "ASUS";
366+
type = DEVICE_TYPE_KEYBOARD;
367+
description = "ASUS Aura Keyboard Device";
368+
location = controller->GetDeviceLocation();
369+
serial = controller->GetSerialString();
370370

371371
mode Direct;
372-
Direct.name = "Direct";
373-
Direct.value = 0;
374-
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR;
375-
Direct.color_mode = MODE_COLORS_PER_LED;
372+
Direct.name = "Direct";
373+
Direct.value = 0;
374+
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR;
375+
Direct.color_mode = MODE_COLORS_PER_LED;
376376
modes.push_back(Direct);
377377

378378
SetupZones();

‎Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
#include "LogManager.h"
1515
#include "StringUtils.h"
1616

17-
AuraMonitorController::AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid)
17+
AuraMonitorController::AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid, std::string dev_name)
1818
{
1919
dev = dev_handle;
2020
location = path;
2121
device_pid = pid;
22+
name = dev_name;
2223
}
2324

2425
AuraMonitorController::~AuraMonitorController()
@@ -31,6 +32,11 @@ std::string AuraMonitorController::GetDeviceLocation()
3132
return("HID: " + location);
3233
}
3334

35+
std::string AuraMonitorController::GetNameString()
36+
{
37+
return(name);
38+
}
39+
3440
std::string AuraMonitorController::GetSerialString()
3541
{
3642
wchar_t serial_string[128];

‎Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.h‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,21 @@ enum
2727
class AuraMonitorController
2828
{
2929
public:
30-
AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid);
30+
AuraMonitorController(hid_device* dev_handle, const char* path, uint16_t pid, std::string dev_name);
3131
virtual ~AuraMonitorController();
3232

3333
std::string GetDeviceLocation();
34+
std::string GetNameString();
3435
std::string GetSerialString();
3536

36-
void BeginUpdate();
37-
void UpdateLed(int led, unsigned char red, unsigned char green, unsigned char blue);
38-
void ApplyChanges();
37+
void BeginUpdate();
38+
void UpdateLed(int led, unsigned char red, unsigned char green, unsigned char blue);
39+
void ApplyChanges();
3940

40-
uint16_t device_pid;
41+
uint16_t device_pid;
4142

4243
private:
43-
hid_device* dev;
44-
std::string location;
44+
hid_device* dev;
45+
std::string location;
46+
std::string name;
4547
};

0 commit comments

Comments
 (0)