mirror/OpenRGB
1
0 Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-10-26 18:39:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Initial commit for the AMD RX 6900 XT reference GPU to resolve #2612

Browse Source 
+ Adding USB PID `0x015B` to the existing controller.
+ Adding missing colour modes `Rainbow Wave`, `Swirl`, `Chase` and `Bounce`
This commit is contained in:
Chris committed 2022-07-25 03:33:50 +10:00
1 parent 20c50ba367
commit a0f9e4ed01
4 files changed
+238 -126
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp
+128 -54
View File
@@ -22,64 +22,127 @@
RGBController_CMR6000Controller::RGBController_CMR6000Controller(CMR6000Controller* controller_ptr)
{
controller = controller_ptr;
unsigned char speed = controller->GetLedSpeed();
controller = controller_ptr;
unsigned char speed = controller->GetLedSpeed();
name = "AMD RX 6xxx GPU";
vendor = "Cooler Master";
type = DEVICE_TYPE_GPU;
description = controller->GetDeviceName();
serial = controller->GetSerial();
location = controller->GetLocation();
name = "AMD RX 6xxx GPU";
vendor = "Cooler Master";
type = DEVICE_TYPE_GPU;
description = controller->GetDeviceName();
serial = controller->GetSerial();
location = controller->GetLocation();
mode Off;
Off.name = "Off";
Off.flags = 0;
Off.value = CM_MR6000_MODE_OFF;
Off.color_mode = MODE_COLORS_NONE;
Off.name = "Off";
Off.flags = 0;
Off.value = CM_MR6000_MODE_OFF;
Off.color_mode = MODE_COLORS_NONE;
modes.push_back(Off);
mode Direct;
Direct.name = "Direct";
Direct.value = CM_MR6000_MODE_DIRECT;
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR| MODE_FLAG_HAS_BRIGHTNESS;
Direct.color_mode = MODE_COLORS_PER_LED;
Direct.colors_min = 1;
Direct.colors_max = 1;
Direct.colors.resize(1);
Direct.brightness_min = 0x00;
Direct.brightness_max = 0xFF;
Direct.brightness = 0xFF;
Direct.name = "Direct";
Direct.value = CM_MR6000_MODE_DIRECT;
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR| MODE_FLAG_HAS_BRIGHTNESS;
Direct.color_mode = MODE_COLORS_PER_LED;
Direct.speed = 0xFF;
Direct.brightness_min = 0x00;
Direct.brightness_max = 0xFF;
Direct.brightness = 0xFF;
modes.push_back(Direct);
mode ColorCycle;
ColorCycle.name = "Color Cycle";
ColorCycle.value = CM_MR6000_MODE_COLOR_CYCLE;
ColorCycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
ColorCycle.speed_min = MR6000_CYCLE_SPEED_SLOWEST;
ColorCycle.speed = MR6000_CYCLE_SPEED_NORMAL;
ColorCycle.speed_max = MR6000_CYCLE_SPEED_FASTEST;
ColorCycle.color_mode = MODE_COLORS_NONE;
ColorCycle.speed = speed;
ColorCycle.brightness_min = 0x00;
ColorCycle.brightness_max = 0xFF;
ColorCycle.brightness = 0x7F;
ColorCycle.name = "Spectrum Cycle";
ColorCycle.value = CM_MR6000_MODE_COLOR_CYCLE;
ColorCycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
ColorCycle.speed_min = MR6000_CYCLE_SPEED_SLOWEST;
ColorCycle.speed = MR6000_CYCLE_SPEED_NORMAL;
ColorCycle.speed_max = MR6000_CYCLE_SPEED_FASTEST;
ColorCycle.color_mode = MODE_COLORS_NONE;
ColorCycle.speed = MR6000_CYCLE_SPEED_NORMAL;
ColorCycle.brightness_min = 0x00;
ColorCycle.brightness_max = 0xFF;
ColorCycle.brightness = 0x7F;
modes.push_back(ColorCycle);
mode Breathing;
Breathing.name = "Breathing";
Breathing.value = CM_MR6000_MODE_BREATHE;
Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
Breathing.speed_min = MR6000_BREATHE_SPEED_SLOWEST;
Breathing.speed = MR6000_BREATHE_SPEED_NORMAL;
Breathing.speed_max = MR6000_BREATHE_SPEED_FASTEST;
Breathing.color_mode = MODE_COLORS_PER_LED;
Breathing.colors_min = 1;
Breathing.colors_max = 1;
Breathing.name = "Breathing";
Breathing.value = CM_MR6000_MODE_BREATHE;
Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
Breathing.speed_min = MR6000_BREATHE_SPEED_SLOWEST;
Breathing.speed = MR6000_BREATHE_SPEED_NORMAL;
Breathing.speed_max = MR6000_BREATHE_SPEED_FASTEST;
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
Breathing.colors_min = 1;
Breathing.colors_max = 1;
Breathing.colors.resize(1);
Breathing.speed = speed;
Breathing.speed = MR6000_BREATHE_SPEED_NORMAL;
modes.push_back(Breathing);
if(controller->GetPID() == COOLERMASTER_RADEON_6900_PID)
{
mode Rainbow;
Rainbow.name = "Rainbow Wave";
Rainbow.value = CM_MR6000_MODE_RAINBOW;
Rainbow.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Rainbow.speed_min = MR6000_RAINBOW_SPEED_SLOWEST;
Rainbow.speed = MR6000_RAINBOW_SPEED_NORMAL;
Rainbow.speed_max = MR6000_RAINBOW_SPEED_FASTEST;
Rainbow.color_mode = MODE_COLORS_NONE;
Rainbow.speed = MR6000_CYCLE_SPEED_NORMAL;
Rainbow.brightness_min = 0x00;
Rainbow.brightness_max = 0xFF;
Rainbow.brightness = 0xFF;
modes.push_back(Rainbow);
mode Bounce;
Bounce.name = "Bounce";
Bounce.value = CM_MR6000_MODE_BOUNCE;
Bounce.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Bounce.speed_min = MR6000_CYCLE_SPEED_SLOWEST;
Bounce.speed = MR6000_CYCLE_SPEED_NORMAL;
Bounce.speed_max = MR6000_CYCLE_SPEED_FASTEST;
Bounce.color_mode = MODE_COLORS_NONE;
Bounce.speed = MR6000_CYCLE_SPEED_NORMAL;
Bounce.brightness_min = 0x00;
Bounce.brightness_max = 0xFF;
Bounce.brightness = 0xFF;
modes.push_back(Bounce);
mode Chase;
Chase.name = "Chase";
Chase.value = CM_MR6000_MODE_CHASE;
Chase.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_DIRECTION_LR;
Chase.speed_min = MR6000_CYCLE_SPEED_SLOWEST;
Chase.speed = MR6000_CYCLE_SPEED_NORMAL;
Chase.speed_max = MR6000_CYCLE_SPEED_FASTEST;
Chase.color_mode = MODE_COLORS_MODE_SPECIFIC;
Chase.colors_min = 2;
Chase.colors_max = 2;
Chase.colors.resize(2);
Chase.speed = MR6000_CYCLE_SPEED_NORMAL;
Chase.brightness_min = 0;
Chase.brightness_max = 0xFF;
Chase.brightness = 0xFF;
modes.push_back(Chase);
mode Swirl;
Swirl.name = "Swirl";
Swirl.value = CM_MR6000_MODE_SWIRL;
Swirl.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_DIRECTION_LR;
Swirl.speed_min = MR6000_CYCLE_SPEED_SLOWEST;
Swirl.speed = MR6000_CYCLE_SPEED_NORMAL;
Swirl.speed_max = MR6000_CYCLE_SPEED_FASTEST;
Swirl.color_mode = MODE_COLORS_MODE_SPECIFIC;
Swirl.colors_min = 1;
Swirl.colors_max = 1;
Swirl.colors.resize(1);
Swirl.speed = MR6000_CYCLE_SPEED_NORMAL;
Swirl.brightness_min = 0;
Swirl.brightness_max = 0xFF;
Swirl.brightness = 0xFF;
modes.push_back(Swirl);
}
SetupZones();
active_mode = 1;
}
@@ -118,21 +181,32 @@ void RGBController_CMR6000Controller::ResizeZone(int /*zone*/, int /*new_size*/)
void RGBController_CMR6000Controller::DeviceUpdateLEDs()
{
unsigned char red = 0;
unsigned char grn = 0;
unsigned char blu = 0;
mode new_mode = modes[active_mode];
RGBColor color1 = (new_mode.colors.size() > 0) ? new_mode.colors[0] : colors[0];
RGBColor color2 = (new_mode.colors.size() > 1) ? new_mode.colors[1] : 0;
unsigned char bri = (new_mode.flags & MODE_FLAG_HAS_BRIGHTNESS) ? new_mode.brightness : 0xFF;
unsigned char rnd = 0x20;
if(modes[active_mode].color_mode == MODE_COLORS_PER_LED)
switch(new_mode.value)
{
red = RGBGetRValue(colors[0]);
grn = RGBGetGValue(colors[0]);
blu = RGBGetBValue(colors[0]);
/*-----------------------------------------------------------------*\
| Breathing mode requires value 0x20 when in MODE_SPECIFIC_COLOR |
\*-----------------------------------------------------------------*/
case CM_MR6000_MODE_BREATHE:
if(new_mode.color_mode == MODE_COLORS_RANDOM)
{
rnd = 0xA0;
}
break;
case CM_MR6000_MODE_SWIRL:
case CM_MR6000_MODE_CHASE:
rnd = new_mode.direction;
break;
default:
rnd = 0;
}
unsigned char rnd = (modes[active_mode].color_mode == MODE_COLORS_RANDOM) ? 0xA0 : 0x20;
unsigned char bri = (modes[active_mode].flags & MODE_FLAG_HAS_BRIGHTNESS) ? modes[active_mode].brightness : 0xFF;
controller->SetMode(modes[active_mode].value, modes[active_mode].speed, red, grn, blu, rnd, bri);
controller->SetMode(new_mode.value, new_mode.speed, color1, color2, rnd, bri);
}
void RGBController_CMR6000Controller::UpdateZoneLEDs(int /*zone*/)