Store name in AsusLegacyUSBControllers to avoid setting it in detectors

CalcProgrammer1 · CalcProgrammer1 · commit c7616613861f · 2025-08-04T13:37:21.000-05:00
diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp
@@ -21,10 +21,11 @@
 
 #define ASUS_CERBERUS_KB_PACKET_SIZE 8
 
-AsusCerberusKeyboardController::AsusCerberusKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version)
+AsusCerberusKeyboardController::AsusCerberusKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version, std::string dev_name)
 {
     dev         = dev_handle;
     location    = path;
+    name        = dev_name;
     version     = rev_version;
 }
 
@@ -38,6 +39,11 @@ std::string AsusCerberusKeyboardController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string AsusCerberusKeyboardController::GetDeviceName()
+{
+    return(name);
+}
+
 std::string AsusCerberusKeyboardController::GetSerialString()
 {
     wchar_t serial_string[128];
diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h
@@ -30,10 +30,11 @@ enum
 class AsusCerberusKeyboardController
 {
 public:
-    AsusCerberusKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version);
+    AsusCerberusKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version, std::string dev_name);
     ~AsusCerberusKeyboardController();
 
     std::string GetDeviceLocation();
+    std::string GetDeviceName();
     std::string GetSerialString();
     std::string GetVersion();
 
@@ -47,5 +48,6 @@ class AsusCerberusKeyboardController
 private:
     hid_device*                 dev;
     std::string                 location;
+    std::string                 name;
     unsigned short              version;
 };
diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp
@@ -176,7 +176,7 @@ static const std::vector<led_value> led_names =
 
 RGBController_AsusCerberusKeyboard::RGBController_AsusCerberusKeyboard(AsusCerberusKeyboardController* controller_ptr)
 {
-    controller  = controller_ptr;
+    controller                      = controller_ptr;
 
     /*------------------------------------------------------------------------------------------------------*\
     | this device has 6 different profiles, but there is no way to fetch them from the device,               |
@@ -185,13 +185,13 @@ RGBController_AsusCerberusKeyboard::RGBController_AsusCerberusKeyboard(AsusCerbe
 
     controller->SetProfile(1);
 
-    name        = "ASUS Cerberus Keyboard";
-    vendor      = "ASUS";
-    type        = DEVICE_TYPE_KEYBOARD;
-    description = "ASUS Cerberus Keyboard Device";
-    location    = controller->GetDeviceLocation();
-    serial      = controller->GetSerialString();
-    version     = controller->GetVersion();
+    name                            = controller->GetDeviceName();
+    vendor                          = "ASUS";
+    type                            = DEVICE_TYPE_KEYBOARD;
+    description                     = "ASUS Cerberus Keyboard Device";
+    location                        = controller->GetDeviceLocation();
+    serial                          = controller->GetSerialString();
+    version                         = controller->GetVersion();
 
     mode Custom;
     Custom.name                     = "Custom";
diff --git a/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp b/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp
@@ -29,9 +29,9 @@ void DetectAsusCerberusMech(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        AsusCerberusKeyboardController*     controller          = new AsusCerberusKeyboardController(dev, info->path, info->release_number);
+        AsusCerberusKeyboardController*     controller          = new AsusCerberusKeyboardController(dev, info->path, info->release_number, name);
         RGBController_AsusCerberusKeyboard* rgb_controller      = new RGBController_AsusCerberusKeyboard(controller);
-        rgb_controller->name                                = name;
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
@@ -42,9 +42,9 @@ void DetectAsusSagarisKeyboard(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        AsusSagarisKeyboardController*     controller          = new AsusSagarisKeyboardController(dev, info->path, info->release_number);
+        AsusSagarisKeyboardController*     controller          = new AsusSagarisKeyboardController(dev, info->path, info->release_number, name);
         RGBController_AsusSagarisKeyboard* rgb_controller      = new RGBController_AsusSagarisKeyboard(controller);
-        rgb_controller->name                                = name;
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
@@ -55,9 +55,9 @@ void DetectAsusStrixClaw(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        StrixClawController*     controller          = new StrixClawController(dev, info->path);
+        StrixClawController*     controller          = new StrixClawController(dev, info->path, name);
         RGBController_StrixClaw* rgb_controller      = new RGBController_StrixClaw(controller);
-        rgb_controller->name = name;
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp
@@ -20,10 +20,11 @@
 
 #define ASUS_SAGARIS_KB_PACKET_SIZE 65
 
-AsusSagarisKeyboardController::AsusSagarisKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version)
+AsusSagarisKeyboardController::AsusSagarisKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version, std::string dev_name)
 {
     dev         = dev_handle;
     location    = path;
+    name        = dev_name;
     version     = rev_version;
 }
 
@@ -42,6 +43,11 @@ std::string AsusSagarisKeyboardController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string AsusSagarisKeyboardController::GetDeviceName()
+{
+    return(name);
+}
+
 std::string AsusSagarisKeyboardController::GetSerialString()
 {
     wchar_t serial_string[128];
diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h
@@ -54,11 +54,12 @@ typedef struct
 class AsusSagarisKeyboardController
 {
 public:
-    AsusSagarisKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version);
+    AsusSagarisKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version, std::string dev_name);
     ~AsusSagarisKeyboardController();
 
     std::string GetVersion();
     std::string GetDeviceLocation();
+    std::string GetDeviceName();
     std::string GetSerialString();
 
     sagaris_mode          GetMode();
@@ -73,5 +74,6 @@ class AsusSagarisKeyboardController
 private:
     hid_device*                 dev;
     std::string                 location;
+    std::string                 name;
     unsigned short              version;
 };
diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp
@@ -28,7 +28,7 @@ RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagaris
 {
     controller                  = controller_ptr;
 
-    name                        = "ASUS Sagaris Keyboard";
+    name                        = controller->GetDeviceName();
     vendor                      = "ASUS";
     type                        = DEVICE_TYPE_KEYBOARD;
     description                 = "ASUS Sagaris Keyboard Device";
diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp
@@ -14,10 +14,11 @@
 #include "AsusStrixClawController.h"
 #include "StringUtils.h"
 
-StrixClawController::StrixClawController(hid_device* dev_handle, const char* path)
+StrixClawController::StrixClawController(hid_device* dev_handle, const char* path, std::string dev_name)
 {
     dev         = dev_handle;
     location    = path;
+    name        = dev_name;
 }
 
 StrixClawController::~StrixClawController()
@@ -30,6 +31,11 @@ std::string StrixClawController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string StrixClawController::GetDeviceName()
+{
+    return(name);
+}
+
 std::string StrixClawController::GetSerialString()
 {
     wchar_t serial_string[HID_MAX_STR];
diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h
@@ -20,10 +20,11 @@
 class StrixClawController
 {
 public:
-    StrixClawController(hid_device* dev_handle, const char* path);
+    StrixClawController(hid_device* dev_handle, const char* path, std::string dev_name);
     virtual ~StrixClawController();
 
     std::string GetDeviceLocation();
+    std::string GetDeviceName();
     std::string GetSerialString();
     std::string GetVersion();
 
@@ -33,4 +34,5 @@ class StrixClawController
 private:
     hid_device*                 dev;
     std::string                 location;
+    std::string                 name;
 };
diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.cpp b/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.cpp
@@ -26,7 +26,7 @@ RGBController_StrixClaw::RGBController_StrixClaw(StrixClawController* controller
 {
     controller   = controller_ptr;
 
-    name         = "ASUS ROG Strix Claw";
+    name         = controller->GetDeviceName();
     vendor       = "ASUS";
     type         = DEVICE_TYPE_MOUSE;
     description  = "ASUS Legacy Mouse Device";

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,11 @@`
`21`	`21`
`22`	`22`	`#define ASUS_CERBERUS_KB_PACKET_SIZE 8`
`23`	`23`
`24`		`-AsusCerberusKeyboardController::AsusCerberusKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version)`
	`24`	`+AsusCerberusKeyboardController::AsusCerberusKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version, std::string dev_name)`
`25`	`25`	`{`
`26`	`26`	`dev = dev_handle;`
`27`	`27`	`location = path;`
	`28`	`+ name = dev_name;`
`28`	`29`	`version = rev_version;`
`29`	`30`	`}`
`30`	`31`
`@@ -38,6 +39,11 @@ std::string AsusCerberusKeyboardController::GetDeviceLocation()`
`38`	`39`	`return("HID: " + location);`
`39`	`40`	`}`
`40`	`41`
	`42`	`+std::string AsusCerberusKeyboardController::GetDeviceName()`
	`43`	`+{`
	`44`	`+ return(name);`
	`45`	`+}`
	`46`	`+`
`41`	`47`	`std::string AsusCerberusKeyboardController::GetSerialString()`
`42`	`48`	`{`
`43`	`49`	`wchar_t serial_string[128];`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ void DetectAsusCerberusMech(hid_device_info* info, const std::string& name)`
`29`	`29`
`30`	`30`	`if(dev)`
`31`	`31`	`{`
`32`		`- AsusCerberusKeyboardController* controller = new AsusCerberusKeyboardController(dev, info->path, info->release_number);`
	`32`	`+ AsusCerberusKeyboardController* controller = new AsusCerberusKeyboardController(dev, info->path, info->release_number, name);`
`33`	`33`	`RGBController_AsusCerberusKeyboard* rgb_controller = new RGBController_AsusCerberusKeyboard(controller);`
`34`		`- rgb_controller->name = name;`
	`34`	`+`
`35`	`35`	`ResourceManager::get()->RegisterRGBController(rgb_controller);`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -42,9 +42,9 @@ void DetectAsusSagarisKeyboard(hid_device_info* info, const std::string& name)`
`42`	`42`
`43`	`43`	`if(dev)`
`44`	`44`	`{`
`45`		`- AsusSagarisKeyboardController* controller = new AsusSagarisKeyboardController(dev, info->path, info->release_number);`
	`45`	`+ AsusSagarisKeyboardController* controller = new AsusSagarisKeyboardController(dev, info->path, info->release_number, name);`
`46`	`46`	`RGBController_AsusSagarisKeyboard* rgb_controller = new RGBController_AsusSagarisKeyboard(controller);`
`47`		`- rgb_controller->name = name;`
	`47`	`+`
`48`	`48`	`ResourceManager::get()->RegisterRGBController(rgb_controller);`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -55,9 +55,9 @@ void DetectAsusStrixClaw(hid_device_info* info, const std::string& name)`
`55`	`55`
`56`	`56`	`if(dev)`
`57`	`57`	`{`
`58`		`- StrixClawController* controller = new StrixClawController(dev, info->path);`
	`58`	`+ StrixClawController* controller = new StrixClawController(dev, info->path, name);`
`59`	`59`	`RGBController_StrixClaw* rgb_controller = new RGBController_StrixClaw(controller);`
`60`		`- rgb_controller->name = name;`
	`60`	`+`
`61`	`61`	`ResourceManager::get()->RegisterRGBController(rgb_controller);`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,11 @@`
`20`	`20`
`21`	`21`	`#define ASUS_SAGARIS_KB_PACKET_SIZE 65`
`22`	`22`
`23`		`-AsusSagarisKeyboardController::AsusSagarisKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version)`
	`23`	`+AsusSagarisKeyboardController::AsusSagarisKeyboardController(hid_device* dev_handle, const char* path, unsigned short rev_version, std::string dev_name)`
`24`	`24`	`{`
`25`	`25`	`dev = dev_handle;`
`26`	`26`	`location = path;`
	`27`	`+ name = dev_name;`
`27`	`28`	`version = rev_version;`
`28`	`29`	`}`
`29`	`30`
`@@ -42,6 +43,11 @@ std::string AsusSagarisKeyboardController::GetDeviceLocation()`
`42`	`43`	`return("HID: " + location);`
`43`	`44`	`}`
`44`	`45`
	`46`	`+std::string AsusSagarisKeyboardController::GetDeviceName()`
	`47`	`+{`
	`48`	`+ return(name);`
	`49`	`+}`
	`50`	`+`
`45`	`51`	`std::string AsusSagarisKeyboardController::GetSerialString()`
`46`	`52`	`{`
`47`	`53`	`wchar_t serial_string[128];`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagaris`
`28`	`28`	`{`
`29`	`29`	`controller = controller_ptr;`
`30`	`30`
`31`		`- name = "ASUS Sagaris Keyboard";`
	`31`	`+ name = controller->GetDeviceName();`
`32`	`32`	`vendor = "ASUS";`
`33`	`33`	`type = DEVICE_TYPE_KEYBOARD;`
`34`	`34`	`description = "ASUS Sagaris Keyboard Device";`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,11 @@`
`14`	`14`	`#include "AsusStrixClawController.h"`
`15`	`15`	`#include "StringUtils.h"`
`16`	`16`
`17`		`-StrixClawController::StrixClawController(hid_device* dev_handle, const char* path)`
	`17`	`+StrixClawController::StrixClawController(hid_device* dev_handle, const char* path, std::string dev_name)`
`18`	`18`	`{`
`19`	`19`	`dev = dev_handle;`
`20`	`20`	`location = path;`
	`21`	`+ name = dev_name;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`StrixClawController::~StrixClawController()`
`@@ -30,6 +31,11 @@ std::string StrixClawController::GetDeviceLocation()`
`30`	`31`	`return("HID: " + location);`
`31`	`32`	`}`
`32`	`33`
	`34`	`+std::string StrixClawController::GetDeviceName()`
	`35`	`+{`
	`36`	`+ return(name);`
	`37`	`+}`
	`38`	`+`
`33`	`39`	`std::string StrixClawController::GetSerialString()`
`34`	`40`	`{`
`35`	`41`	`wchar_t serial_string[HID_MAX_STR];`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ RGBController_StrixClaw::RGBController_StrixClaw(StrixClawController* controller`
`26`	`26`	`{`
`27`	`27`	`controller = controller_ptr;`
`28`	`28`
`29`		`- name = "ASUS ROG Strix Claw";`
	`29`	`+ name = controller->GetDeviceName();`
`30`	`30`	`vendor = "ASUS";`
`31`	`31`	`type = DEVICE_TYPE_MOUSE;`
`32`	`32`	`description = "ASUS Legacy Mouse Device";`