Store name in NvidiaESAController to avoid setting it in detector

Controllers/NvidiaESAController/NvidiaESAController.cpp

@@ -13,11 +13,11 @@
 #include "NvidiaESAController.h"
 #include "StringUtils.h"
 
-NvidiaESAController::NvidiaESAController(hid_device* dev_handle, const hid_device_info& info)
+NvidiaESAController::NvidiaESAController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
 {
-    dev                 = dev_handle;
-    location            = info.path;
-    version             = "";
+    dev         = dev_handle;
+    location    = info.path;
+    name        = dev_name;
 }
 
 NvidiaESAController::~NvidiaESAController()
@@ -30,6 +30,11 @@ std::string NvidiaESAController::GetDeviceLocation()
     return("HID: " + location);
 }
 
+std::string NvidiaESAController::GetNameString()
+{
+    return(name);
+}
+
 std::string NvidiaESAController::GetSerialString()
 {
     wchar_t serial_string[128];
@@ -43,11 +48,6 @@ std::string NvidiaESAController::GetSerialString()
     return(StringUtils::wstring_to_string(serial_string));
 }
 
-std::string NvidiaESAController::GetFirmwareVersion()
-{
-    return(version);
-}
-
 void NvidiaESAController::SetZoneColor(unsigned int zone_idx, RGBColor color)
 {
     unsigned char red = (unsigned char)(0x0F - 0x0F * RGBGetRValue(color) / 255.0f);

Controllers/NvidiaESAController/NvidiaESAController.h

@@ -18,12 +18,12 @@
 class NvidiaESAController
 {
 public:
-    NvidiaESAController(hid_device* dev_handle, const hid_device_info& info);
+    NvidiaESAController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
     ~NvidiaESAController();
 
-    std::string                 GetSerialString();
     std::string                 GetDeviceLocation();
-    std::string                 GetFirmwareVersion();
+    std::string                 GetNameString();
+    std::string                 GetSerialString();
 
     void                        SetZoneColor(unsigned int zone_idx, RGBColor color);
 
@@ -32,5 +32,5 @@ protected:
 
 private:
     std::string                 location;
-    std::string                 version;
+    std::string                 name;
 };

Controllers/NvidiaESAController/NvidiaESAControllerDetect.cpp

@@ -29,9 +29,9 @@ void DetectNvidiaESAControllers(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        NvidiaESAController*     controller      = new NvidiaESAController(dev, *info);
+        NvidiaESAController*     controller      = new NvidiaESAController(dev, *info, name);
         RGBController_NvidiaESA* rgb_controller  = new RGBController_NvidiaESA(controller);
-        rgb_controller->name = name;
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }

Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp

@@ -27,13 +27,13 @@
 RGBController_NvidiaESA::RGBController_NvidiaESA(NvidiaESAController* controller_ptr)
 {
     controller                          = controller_ptr;
-    name                                = "Nvidia ESA USB Device";
+
+    name                                = controller->GetNameString();
     vendor                              = "NVIDIA";
     type                                = DEVICE_TYPE_CASE;
-    description                         = name;
+    description                         = "Nvidia ESA USB Device";;
     location                            = controller->GetDeviceLocation();
     serial                              = controller->GetSerialString();
-    version                             = controller->GetFirmwareVersion();
 
     mode Static;
     Static.name                         = "Static";