From 2bde9b287fc5759fb93f6c07a853dd3647ddeaa1 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Sun, 10 Aug 2025 00:07:00 -0500
Subject: [PATCH] Store name in GigabyteAorusMouseController to avoid setting
 it in detector

---
 .../GigabyteAorusMouseController.cpp           | 18 ++++++++++++------
 .../GigabyteAorusMouseController.h             |  6 ++++--
 .../GigabyteAorusMouseControllerDetect.cpp     |  5 ++---
 .../RGBController_GigabyteAorusMouse.cpp       |  4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
index 4754174da..6d00e1faf 100644
--- a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
+++ b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
@@ -13,10 +13,11 @@
 #include "GigabyteAorusMouseController.h"
 #include "StringUtils.h"
 
-GigabyteAorusMouseController::GigabyteAorusMouseController(hid_device* dev_handle, const hid_device_info& info)
+GigabyteAorusMouseController::GigabyteAorusMouseController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
 {
     dev                 = dev_handle;
     location            = info.path;
+    name                = dev_name;
     version             = "";
 }
 
@@ -30,6 +31,16 @@ std::string GigabyteAorusMouseController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string GigabyteAorusMouseController::GetFirmwareVersion()
+{
+    return(version);
+}
+
+std::string GigabyteAorusMouseController::GetNameString()
+{
+    return(name);
+}
+
 std::string GigabyteAorusMouseController::GetSerialString()
 {
     wchar_t serial_string[128];
@@ -43,11 +54,6 @@ std::string GigabyteAorusMouseController::GetSerialString()
     return(StringUtils::wstring_to_string(serial_string));
 }
 
-std::string GigabyteAorusMouseController::GetFirmwareVersion()
-{
-    return(version);
-}
-
 void GigabyteAorusMouseController::SetMode(RGBColor color, uint8_t mode_value, uint8_t brightness, uint8_t speed)
 {
     uint8_t usb_buf[GIGABYTE_AORUS_MOUSE_REPORT_SIZE];
diff --git a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
index 4633a4ede..333c035de 100644
--- a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
+++ b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
@@ -40,12 +40,13 @@ enum
 class GigabyteAorusMouseController
 {
 public:
-    GigabyteAorusMouseController(hid_device* dev_handle, const hid_device_info& info);
+    GigabyteAorusMouseController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
     ~GigabyteAorusMouseController();
 
-    std::string GetSerialString();
     std::string GetDeviceLocation();
     std::string GetFirmwareVersion();
+    std::string GetNameString();
+    std::string GetSerialString();
 
     void        SetMode(RGBColor color, uint8_t mode_value, uint8_t brightness, uint8_t speed);
     void        SendDirect(RGBColor color);
@@ -54,5 +55,6 @@ private:
     hid_device* dev;
 
     std::string location;
+    std::string name;
     std::string version;
 };
diff --git a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseControllerDetect.cpp b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseControllerDetect.cpp
index f90066869..7eda219ae 100644
--- a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseControllerDetect.cpp
+++ b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseControllerDetect.cpp
@@ -30,9 +30,8 @@ void DetectGigabyteAorusMouseControllers(hid_device_info* info, const std::strin
 
     if(dev)
     {
-        GigabyteAorusMouseController*     controller         = new GigabyteAorusMouseController(dev, *info);
-        RGBController_GigabyteAorusMouse* rgb_controller     = new RGBController_GigabyteAorusMouse(controller);
-        rgb_controller->name                     = name;
+        GigabyteAorusMouseController*     controller     = new GigabyteAorusMouseController(dev, *info, name);
+        RGBController_GigabyteAorusMouse* rgb_controller = new RGBController_GigabyteAorusMouse(controller);
 
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
diff --git a/Controllers/GigabyteAorusMouseController/RGBController_GigabyteAorusMouse.cpp b/Controllers/GigabyteAorusMouseController/RGBController_GigabyteAorusMouse.cpp
index 79afa629d..d000d0110 100644
--- a/Controllers/GigabyteAorusMouseController/RGBController_GigabyteAorusMouse.cpp
+++ b/Controllers/GigabyteAorusMouseController/RGBController_GigabyteAorusMouse.cpp
@@ -26,10 +26,10 @@
 RGBController_GigabyteAorusMouse::RGBController_GigabyteAorusMouse(GigabyteAorusMouseController* controller_ptr)
 {
     controller                          = controller_ptr;
-    name                                = "Gigabyte Aorus";
+    name                                = controller->GetNameString();
     vendor                              = "Gigabyte";
     type                                = DEVICE_TYPE_MOUSE;
-    description                         = name;
+    description                         = "Gigabyte Mouse Device";
     location                            = controller->GetDeviceLocation();
     serial                              = controller->GetSerialString();
     version                             = controller->GetFirmwareVersion();