From 0bdf600409aa737468728ad811c2f39de8bbc9aa Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Mon, 11 Aug 2025 18:04:55 -0500
Subject: [PATCH] Store name in InstantMouseController to avoid setting it in
 detector

---
 .../InstantMouseController.cpp                     | 14 +++++++-------
 .../InstantMouseController.h                       |  8 ++++----
 .../InstantMouseControllerDetect.cpp               |  4 ++--
 .../RGBController_InstantMouse.cpp                 |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Controllers/InstantMouseController/InstantMouseController.cpp b/Controllers/InstantMouseController/InstantMouseController.cpp
index 0f2413a9..fab06b1c 100644
--- a/Controllers/InstantMouseController/InstantMouseController.cpp
+++ b/Controllers/InstantMouseController/InstantMouseController.cpp
@@ -13,12 +13,12 @@
 #include "InstantMouseController.h"
 #include "StringUtils.h"
 
-InstantMouseController::InstantMouseController(hid_device* dev_handle, const hid_device_info& info)
+InstantMouseController::InstantMouseController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
 {
     dev                 = dev_handle;
     location            = info.path;
     pid                 = info.product_id;
-    version             = "";
+    name                = dev_name;
 }
 
 InstantMouseController::~InstantMouseController()
@@ -31,6 +31,11 @@ std::string InstantMouseController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string InstantMouseController::GetNameString()
+{
+    return(name);
+}
+
 std::string InstantMouseController::GetSerialString()
 {
     wchar_t serial_string[128];
@@ -49,11 +54,6 @@ uint16_t InstantMouseController::GetPID()
     return pid;
 }
 
-std::string InstantMouseController::GetFirmwareVersion()
-{
-    return(version);
-}
-
 void InstantMouseController::SendColor(RGBColor color)
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/InstantMouseController/InstantMouseController.h b/Controllers/InstantMouseController/InstantMouseController.h
index dd89cd93..c0de34f3 100644
--- a/Controllers/InstantMouseController/InstantMouseController.h
+++ b/Controllers/InstantMouseController/InstantMouseController.h
@@ -49,13 +49,13 @@ enum
 class InstantMouseController
 {
 public:
-    InstantMouseController(hid_device* dev_handle, const hid_device_info& info);
+    InstantMouseController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
     ~InstantMouseController();
 
+    std::string GetNameString();
     std::string GetSerialString();
     std::string GetDeviceLocation();
     uint16_t GetPID();
-    std::string GetFirmwareVersion();
 
     void SetMode(uint8_t mode_value, uint8_t speed, uint8_t brightness, uint8_t direction);
     void SendColor(RGBColor color);
@@ -63,6 +63,6 @@ public:
 private:
     hid_device* dev;
     std::string location;
-    std::string version;
-    uint16_t pid;
+    std::string name;
+    uint16_t    pid;
 };
diff --git a/Controllers/InstantMouseController/InstantMouseControllerDetect.cpp b/Controllers/InstantMouseController/InstantMouseControllerDetect.cpp
index ff5935a4..34c80602 100644
--- a/Controllers/InstantMouseController/InstantMouseControllerDetect.cpp
+++ b/Controllers/InstantMouseController/InstantMouseControllerDetect.cpp
@@ -21,9 +21,9 @@ void DetectInstantMouseControllers(hid_device_info* info, const std::string& nam
 
     if(dev)
     {
-        InstantMouseController*     controller         = new InstantMouseController(dev, *info);
+        InstantMouseController*     controller         = new InstantMouseController(dev, *info, name);
         RGBController_InstantMouse* rgb_controller     = new RGBController_InstantMouse(controller);
-        rgb_controller->name                           = name;
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
diff --git a/Controllers/InstantMouseController/RGBController_InstantMouse.cpp b/Controllers/InstantMouseController/RGBController_InstantMouse.cpp
index ec763767..0dde0082 100644
--- a/Controllers/InstantMouseController/RGBController_InstantMouse.cpp
+++ b/Controllers/InstantMouseController/RGBController_InstantMouse.cpp
@@ -29,12 +29,12 @@
 RGBController_InstantMouse::RGBController_InstantMouse(InstantMouseController* controller_ptr)
 {
     controller                          = controller_ptr;
-    vendor                              = "Instant Microelectronics";
+
+    vendor                              = controller->GetNameString();
     type                                = DEVICE_TYPE_MOUSE;
     description                         = "Instant USB Gaming Mouse";
     location                            = controller->GetDeviceLocation();
     serial                              = controller->GetSerialString();
-    version                             = controller->GetFirmwareVersion();
 
     mode direct;
     direct.name                         = "Direct";