diff --git a/Controllers/HyperXDRAMController/HyperXDRAMController.cpp b/Controllers/HyperXDRAMController/HyperXDRAMController.cpp index 359e6d89..74283b40 100644 --- a/Controllers/HyperXDRAMController/HyperXDRAMController.cpp +++ b/Controllers/HyperXDRAMController/HyperXDRAMController.cpp @@ -16,8 +16,6 @@ HyperXDRAMController::HyperXDRAMController(i2c_smbus_interface* bus, hyperx_dev_ this->dev = dev; slots_valid = slots; - strcpy(device_name, "HyperX Predator RGB"); - led_count = 0; for(unsigned int slot = 0; slot < 4; slot++) @@ -37,11 +35,6 @@ HyperXDRAMController::~HyperXDRAMController() } -std::string HyperXDRAMController::GetDeviceName() -{ - return(device_name); -} - std::string HyperXDRAMController::GetDeviceLocation() { std::string return_string(bus->device_name); diff --git a/Controllers/HyperXDRAMController/HyperXDRAMController.h b/Controllers/HyperXDRAMController/HyperXDRAMController.h index 910e0e80..f640232c 100644 --- a/Controllers/HyperXDRAMController/HyperXDRAMController.h +++ b/Controllers/HyperXDRAMController/HyperXDRAMController.h @@ -207,7 +207,6 @@ public: HyperXDRAMController(i2c_smbus_interface* bus, hyperx_dev_id dev, unsigned char slots); ~HyperXDRAMController(); - std::string GetDeviceName(); std::string GetDeviceLocation(); unsigned int GetLEDCount(); unsigned int GetSlotCount(); @@ -216,14 +215,13 @@ public: void SendApply(); void SetMode(unsigned char new_mode, bool random, unsigned short new_speed); - + void SetAllColors(unsigned char red, unsigned char green, unsigned char blue); void SetEffectColor(unsigned char red, unsigned char green, unsigned char blue); void SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue); void SetLEDColor(unsigned int slot, unsigned int led, unsigned char red, unsigned char green, unsigned char blue); private: - char device_name[32]; unsigned int led_count; unsigned char slots_valid; i2c_smbus_interface* bus; diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp index f019f8a5..d2acd4fd 100644 --- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp +++ b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp @@ -14,7 +14,7 @@ RGBController_HyperXDRAM::RGBController_HyperXDRAM(HyperXDRAMController* hyperx_ { hyperx = hyperx_ptr; - name = hyperx->GetDeviceName(); + name = "HyperX DRAM"; vendor = "HyperX"; type = DEVICE_TYPE_DRAM; description = "HyperX DRAM Device";