diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp index 446f68bf..ff8a28a4 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp @@ -15,11 +15,12 @@ using namespace std::chrono_literals; -CorsairDominatorPlatinumController::CorsairDominatorPlatinumController(i2c_smbus_interface *bus, corsair_dev_id dev, unsigned int leds_count) +CorsairDominatorPlatinumController::CorsairDominatorPlatinumController(i2c_smbus_interface *bus, corsair_dev_id dev, unsigned int leds_count, std::string dev_name) { this->bus = bus; this->dev = dev; this->leds_count = leds_count; + this->name = dev_name; led_data[0] = 0xc; } @@ -43,6 +44,11 @@ std::string CorsairDominatorPlatinumController::GetDeviceLocation() return("I2C: " + return_string); } +std::string CorsairDominatorPlatinumController::GetDeviceName() +{ + return(name); +} + void CorsairDominatorPlatinumController::SetAllColors ( unsigned char red, diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h index f28b4094..c4d56bc7 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h @@ -21,10 +21,11 @@ typedef unsigned char corsair_dev_id; class CorsairDominatorPlatinumController { public: - CorsairDominatorPlatinumController(i2c_smbus_interface *bus, corsair_dev_id dev, unsigned int leds_count); + CorsairDominatorPlatinumController(i2c_smbus_interface *bus, corsair_dev_id dev, unsigned int leds_count, std::string dev_name); ~CorsairDominatorPlatinumController(); std::string GetDeviceLocation(); + std::string GetDeviceName(); unsigned int GetLEDCount(); void SetAllColors(unsigned char red, unsigned char green, unsigned char blue); @@ -37,6 +38,7 @@ private: i2c_smbus_interface* bus; corsair_dev_id dev; unsigned int leds_count; + std::string name; static unsigned char crc8(unsigned char init, unsigned char poly, unsigned char *data, unsigned char len); }; diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp index 58943942..3cc2ce30 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp @@ -157,9 +157,8 @@ void DetectCorsairDominatorPlatinumControllers(std::vectorname = name; ResourceManager::get()->RegisterRGBController(rgbcontroller); } diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp index cd2d6110..db79be9c 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp +++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp @@ -36,6 +36,7 @@ RGBController_CorsairDominatorPlatinum::RGBController_CorsairDominatorPlatinum(C { controller = controller_ptr; + name = controller->GetDeviceName(); vendor = "Corsair"; type = DEVICE_TYPE_DRAM; description = "Corsair RAM RGB Device";