jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store name in PowerColorRedDevilGPUController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-14 19:24:58 -05:00
parent 2134323bf8
commit ce86faabfe
4 changed files with 156 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Controllers/PowerColorRedDevilGPUController/PowerColorRedDevilGPUController.cpp
View file

@ -14,10 +14,11 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
RedDevilGPUController::RedDevilGPUController(i2c_smbus_interface* bus, red_devil_dev_id dev) RedDevilGPUController::RedDevilGPUController(i2c_smbus_interface* bus, red_devil_dev_id dev, std::string dev_name)
{ {
this->bus = bus; this->bus = bus;
this->dev = dev; this->dev = dev;
this->name = dev_name;
if(bus->pci_device > AMD_NAVI10_DEV) // Only Navi 2 cards have this mode if(bus->pci_device > AMD_NAVI10_DEV) // Only Navi 2 cards have this mode
{ {
@ -40,6 +41,11 @@ std::string RedDevilGPUController::GetDeviceLocation()
return("I2C:" + return_string); return("I2C:" + return_string);
} }
std::string RedDevilGPUController::GetDeviceName()
{
return(name);
}
void RedDevilGPUController::SetLEDColor(int led, RGBColor color) void RedDevilGPUController::SetLEDColor(int led, RGBColor color)
{ {
if(led > RED_DEVIL_GPU_LED_MAX_COUNT) if(led > RED_DEVIL_GPU_LED_MAX_COUNT)

30
Controllers/PowerColorRedDevilGPUController/PowerColorRedDevilGPUController.h
View file

@ -80,28 +80,30 @@ enum
class RedDevilGPUController class RedDevilGPUController
{ {
public: public:
RedDevilGPUController(i2c_smbus_interface* bus, red_devil_dev_id dev); RedDevilGPUController(i2c_smbus_interface* bus, red_devil_dev_id dev, std::string dev_name);
~RedDevilGPUController(); ~RedDevilGPUController();
std::string GetDeviceLocation(); std::string GetDeviceLocation();
std::string GetDeviceName();
void SetLEDColor(int led, RGBColor color); void SetLEDColor(int led, RGBColor color);
RGBColor GetLEDColor(int led); RGBColor GetLEDColor(int led);
void SetLEDColorAll(RGBColor color); void SetLEDColorAll(RGBColor color);
void SetModeColor(RGBColor color); void SetModeColor(RGBColor color);
RGBColor GetModeColor(); RGBColor GetModeColor();
void SetMode(red_devil_mode_config config); void SetMode(red_devil_mode_config config);
red_devil_mode_config GetMode(); red_devil_mode_config GetMode();
int RegisterRead(unsigned char reg, unsigned char *data); int RegisterRead(unsigned char reg, unsigned char *data);
int RegisterWrite(unsigned char reg, unsigned char *data); int RegisterWrite(unsigned char reg, unsigned char *data);
bool has_sync_mode = false; bool has_sync_mode = false;
private: private:
i2c_smbus_interface* bus; i2c_smbus_interface* bus;
red_devil_dev_id dev; red_devil_dev_id dev;
std::string name;
}; };

16
Controllers/PowerColorRedDevilGPUController/PowerColorRedDevilGPUControllerDetect.cpp
View file

@ -20,20 +20,18 @@ void DetectPowerColorRedDevilGPUControllers(i2c_smbus_interface* bus, uint8_t i2
{ {
unsigned char data[3] = {0}; unsigned char data[3] = {0};
int ret = bus->i2c_smbus_read_i2c_block_data(i2c_addr, 0x90, 3, data); int ret = bus->i2c_smbus_read_i2c_block_data(i2c_addr, 0x90, 3, data);
if(ret == 3 && memcmp(data, indicator, 3) == 0) if(ret == 3 && memcmp(data, indicator, 3) == 0)
{ {
RedDevilGPUController* controller = new RedDevilGPUController(bus, i2c_addr); RedDevilGPUController* controller = new RedDevilGPUController(bus, i2c_addr, name);
RGBController_RedDevilGPU* rgb_controller = new RGBController_RedDevilGPU(controller); RGBController_RedDevilGPU* rgb_controller = new RGBController_RedDevilGPU(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller); ResourceManager::get()->RegisterRGBController(rgb_controller);
} }
} }
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX5700", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX5700_SUB_DEV, 0x22); REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX5700", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX5700_SUB_DEV, 0x22);
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX5700XT", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX5700XT_SUB_DEV, 0x22); REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX5700XT", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI10_DEV, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX5700XT_SUB_DEV, 0x22);
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX6750XT", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI22_DEV, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX6750XT_SUB_DEV, 0x22);
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX6900XT Ultimate", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI21_DEV2, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX6900XT_ULTIMATE_SUB_DEV, 0x22); REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX6800XT", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI21_DEV1, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX6800XT_SUB_DEV, 0x22);
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX6900XT Ultimate", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI21_DEV2, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX6900XT_ULTIMATE_SUB_DEV, 0x22);
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX6800XT", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI21_DEV1, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX6800XT_SUB_DEV, 0x22);
REGISTER_I2C_PCI_DETECTOR("PowerColor Red Devil RX6750XT", DetectPowerColorRedDevilGPUControllers, AMD_GPU_VEN, AMD_NAVI22_DEV, POWERCOLOR_SUB_VEN, POWERCOLOR_RED_DEVIL_RX6750XT_SUB_DEV, 0x22);

250
Controllers/PowerColorRedDevilGPUController/RGBController_PowerColorRedDevilGPU.cpp
View file

@ -13,163 +13,163 @@
RGBController_RedDevilGPU::RGBController_RedDevilGPU(RedDevilGPUController* controller_ptr) RGBController_RedDevilGPU::RGBController_RedDevilGPU(RedDevilGPUController* controller_ptr)
{ {
controller = controller_ptr; controller = controller_ptr;
name = "PowerColor Red Devil GPU"; name = controller->GetDeviceName();
vendor = "PowerColor"; vendor = "PowerColor";
description = name; description = "PowerColor Red Devil GPU Device";
location = controller->GetDeviceLocation(); location = controller->GetDeviceLocation();
type = DEVICE_TYPE_GPU;
type = DEVICE_TYPE_GPU;
mode Off; mode Off;
Off.name = "Off"; Off.name = "Off";
Off.value = RED_DEVIL_GPU_MODE_OFF; Off.value = RED_DEVIL_GPU_MODE_OFF;
Off.flags = MODE_FLAG_AUTOMATIC_SAVE; Off.flags = MODE_FLAG_AUTOMATIC_SAVE;
Off.color_mode = MODE_COLORS_NONE; Off.color_mode = MODE_COLORS_NONE;
modes.push_back(Off); modes.push_back(Off);
mode Static; mode Static;
Static.name = "Static"; Static.name = "Static";
Static.value = RED_DEVIL_GPU_MODE_STATIC; Static.value = RED_DEVIL_GPU_MODE_STATIC;
Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_AUTOMATIC_SAVE; Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_AUTOMATIC_SAVE;
Static.color_mode = MODE_COLORS_PER_LED; Static.color_mode = MODE_COLORS_PER_LED;
Static.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; Static.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
Static.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; Static.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Static.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; Static.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
modes.push_back(Static); modes.push_back(Static);
mode Breathing; mode Breathing;
Breathing.name = "Breathing"; Breathing.name = "Breathing";
Breathing.value = RED_DEVIL_GPU_MODE_BREATHING; Breathing.value = RED_DEVIL_GPU_MODE_BREATHING;
Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
Breathing.color_mode = MODE_COLORS_PER_LED; Breathing.color_mode = MODE_COLORS_PER_LED;
Breathing.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; Breathing.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
Breathing.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; Breathing.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Breathing.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; Breathing.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Breathing.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; Breathing.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
Breathing.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; Breathing.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
Breathing.speed = RED_DEVIL_GPU_SPEED_DEFAULT; Breathing.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(Breathing); modes.push_back(Breathing);
mode Neon; mode Neon;
Neon.name = "Neon"; Neon.name = "Neon";
Neon.value = RED_DEVIL_GPU_MODE_NEON; Neon.value = RED_DEVIL_GPU_MODE_NEON;
Neon.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; Neon.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
Neon.color_mode = MODE_COLORS_NONE; Neon.color_mode = MODE_COLORS_NONE;
Neon.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; Neon.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
Neon.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; Neon.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Neon.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; Neon.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Neon.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; Neon.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
Neon.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; Neon.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
Neon.speed = RED_DEVIL_GPU_SPEED_DEFAULT; Neon.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(Neon); modes.push_back(Neon);
mode Blink; mode Blink;
Blink.name = "Blink"; Blink.name = "Blink";
Blink.value = RED_DEVIL_GPU_MODE_BLINK; Blink.value = RED_DEVIL_GPU_MODE_BLINK;
Blink.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; Blink.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
Blink.color_mode = MODE_COLORS_PER_LED; Blink.color_mode = MODE_COLORS_PER_LED;
Blink.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; Blink.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
Blink.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; Blink.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Blink.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; Blink.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Blink.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; Blink.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
Blink.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; Blink.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
Blink.speed = RED_DEVIL_GPU_SPEED_DEFAULT; Blink.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(Blink); modes.push_back(Blink);
mode DoubleBlink; mode DoubleBlink;
DoubleBlink.name = "Double Blink"; DoubleBlink.name = "Double Blink";
DoubleBlink.value = RED_DEVIL_GPU_MODE_DOUBLE_BLINK; DoubleBlink.value = RED_DEVIL_GPU_MODE_DOUBLE_BLINK;
DoubleBlink.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; DoubleBlink.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
DoubleBlink.color_mode = MODE_COLORS_PER_LED; DoubleBlink.color_mode = MODE_COLORS_PER_LED;
DoubleBlink.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; DoubleBlink.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
DoubleBlink.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; DoubleBlink.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
DoubleBlink.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; DoubleBlink.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
DoubleBlink.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; DoubleBlink.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
DoubleBlink.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; DoubleBlink.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
DoubleBlink.speed = RED_DEVIL_GPU_SPEED_DEFAULT; DoubleBlink.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(DoubleBlink); modes.push_back(DoubleBlink);
mode ColorShift; mode ColorShift;
ColorShift.name = "Color Shift"; ColorShift.name = "Color Shift";
ColorShift.value = RED_DEVIL_GPU_MODE_COLOR_SHIFT; ColorShift.value = RED_DEVIL_GPU_MODE_COLOR_SHIFT;
ColorShift.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; ColorShift.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
ColorShift.color_mode = MODE_COLORS_NONE; ColorShift.color_mode = MODE_COLORS_NONE;
ColorShift.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; ColorShift.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
ColorShift.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; ColorShift.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
ColorShift.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; ColorShift.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
ColorShift.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; ColorShift.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
ColorShift.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; ColorShift.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
ColorShift.speed = RED_DEVIL_GPU_SPEED_DEFAULT; ColorShift.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(ColorShift); modes.push_back(ColorShift);
mode Meteor; mode Meteor;
Meteor.name = "Meteor"; Meteor.name = "Meteor";
Meteor.value = RED_DEVIL_GPU_MODE_METEOR; Meteor.value = RED_DEVIL_GPU_MODE_METEOR;
Meteor.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; Meteor.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
Meteor.color_mode = MODE_COLORS_MODE_SPECIFIC; Meteor.color_mode = MODE_COLORS_MODE_SPECIFIC;
Meteor.colors_min = 1; Meteor.colors_min = 1;
Meteor.colors_max = 1; Meteor.colors_max = 1;
Meteor.colors.resize(1); Meteor.colors.resize(1);
Meteor.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; Meteor.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
Meteor.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; Meteor.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Meteor.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; Meteor.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Meteor.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; Meteor.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
Meteor.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; Meteor.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
Meteor.speed = RED_DEVIL_GPU_SPEED_DEFAULT; Meteor.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(Meteor); modes.push_back(Meteor);
mode Ripple; mode Ripple;
Ripple.name = "Ripple"; Ripple.name = "Ripple";
Ripple.value = RED_DEVIL_GPU_MODE_RIPPLE; Ripple.value = RED_DEVIL_GPU_MODE_RIPPLE;
Ripple.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; Ripple.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
Ripple.color_mode = MODE_COLORS_MODE_SPECIFIC; Ripple.color_mode = MODE_COLORS_MODE_SPECIFIC;
Ripple.colors_min = 1; Ripple.colors_min = 1;
Ripple.colors_max = 1; Ripple.colors_max = 1;
Ripple.colors.resize(1); Ripple.colors.resize(1);
Ripple.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; Ripple.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
Ripple.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; Ripple.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Ripple.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; Ripple.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
Ripple.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; Ripple.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
Ripple.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; Ripple.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
Ripple.speed = RED_DEVIL_GPU_SPEED_DEFAULT; Ripple.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(Ripple); modes.push_back(Ripple);
mode SevenColors; mode SevenColors;
SevenColors.name = "Seven Colors"; SevenColors.name = "Seven Colors";
SevenColors.value = RED_DEVIL_GPU_MODE_SEVEN_COLORS; SevenColors.value = RED_DEVIL_GPU_MODE_SEVEN_COLORS;
SevenColors.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE; SevenColors.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_AUTOMATIC_SAVE;
SevenColors.color_mode = MODE_COLORS_NONE; SevenColors.color_mode = MODE_COLORS_NONE;
SevenColors.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN; SevenColors.brightness_min = RED_DEVIL_GPU_BRIGHTNESS_MIN;
SevenColors.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX; SevenColors.brightness_max = RED_DEVIL_GPU_BRIGHTNESS_MAX;
SevenColors.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX; SevenColors.brightness = RED_DEVIL_GPU_BRIGHTNESS_MAX;
SevenColors.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST; SevenColors.speed_min = RED_DEVIL_GPU_SPEED_SLOWEST;
SevenColors.speed_max = RED_DEVIL_GPU_SPEED_FASTEST; SevenColors.speed_max = RED_DEVIL_GPU_SPEED_FASTEST;
SevenColors.speed = RED_DEVIL_GPU_SPEED_DEFAULT; SevenColors.speed = RED_DEVIL_GPU_SPEED_DEFAULT;
modes.push_back(SevenColors); modes.push_back(SevenColors);
if(controller->has_sync_mode) if(controller->has_sync_mode)
{ {
mode Sync; mode Sync;
Sync.name = "Sync with Motherboard"; Sync.name = "Sync with Motherboard";
Sync.value = RED_DEVIL_GPU_MODE_MB_SYNC; Sync.value = RED_DEVIL_GPU_MODE_MB_SYNC;
Sync.flags = MODE_FLAG_AUTOMATIC_SAVE; Sync.flags = MODE_FLAG_AUTOMATIC_SAVE;
Sync.color_mode = MODE_COLORS_NONE; Sync.color_mode = MODE_COLORS_NONE;
modes.push_back(Sync); modes.push_back(Sync);
} }
SetupZones(); SetupZones();
red_devil_mode_config config = controller->GetMode(); red_devil_mode_config config = controller->GetMode();
active_mode = config.mode; active_mode = config.mode;
if (active_mode != RED_DEVIL_GPU_MODE_OFF) if(active_mode != RED_DEVIL_GPU_MODE_OFF)
{ {
modes[active_mode].brightness = config.brightness; modes[active_mode].brightness = config.brightness;
modes[active_mode].speed = config.speed; modes[active_mode].speed = config.speed;
if (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
{ {
modes[active_mode].colors[0] = controller->GetModeColor(); modes[active_mode].colors[0] = controller->GetModeColor();
} }
@ -190,27 +190,25 @@ void RGBController_RedDevilGPU::SetupZones()
/*---------------------------------------------------------*\ /*---------------------------------------------------------*\
| Set up zone | | Set up zone |
\*---------------------------------------------------------*/ \*---------------------------------------------------------*/
zone* new_zone = new zone();
zone* new_zone = new zone(); new_zone->name = "GPU";
new_zone->type = ZONE_TYPE_SINGLE;
new_zone->name = "GPU"; new_zone->leds_min = 1;
new_zone->type = ZONE_TYPE_SINGLE; new_zone->leds_max = 1;
new_zone->leds_min = 1; new_zone->leds_count = 1;
new_zone->leds_max = 1; new_zone->matrix_map = NULL;
new_zone->leds_count = 1; zones.push_back(*new_zone);
new_zone->matrix_map = NULL;
/*---------------------------------------------------------*\ /*---------------------------------------------------------*\
| This device can control up to 12 LEDs | | This device can control up to 12 LEDs |
| For now all LEDs show the same color | | For now all LEDs show the same color |
\*---------------------------------------------------------*/ \*---------------------------------------------------------*/
led* new_led = new led();
led* new_led = new led(); new_led->name = "GPU";
new_led->name = "GPU";
leds.push_back(*new_led); leds.push_back(*new_led);
zones.push_back(*new_zone);
SetupColors(); SetupColors();
} }
@ -238,9 +236,9 @@ void RGBController_RedDevilGPU::UpdateSingleLED(int led)
void RGBController_RedDevilGPU::DeviceUpdateMode() void RGBController_RedDevilGPU::DeviceUpdateMode()
{ {
if (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
{ {
if (modes[active_mode].colors[0] != 0) if(modes[active_mode].colors[0] != 0)
{ {
controller->SetModeColor(modes[active_mode].colors[0]); controller->SetModeColor(modes[active_mode].colors[0]);
} }