mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-04-04 06:11:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update Crucial controller to new RGBController format

Browse Source
This commit is contained in:
Adam Honse
2020-02-12 14:51:07 -06:00
parent 7adcfa77fa
commit fd59f83556
3 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/CrucialController/CrucialControllerDetect.cpp
View File

@@ -16,7 +16,7 @@ static const unsigned char crucial_addresses[] =
0x20,
0x21,
0x22,
0x22
0x23
};

74
RGBController/RGBController_Crucial.cpp
View File

@@ -9,22 +9,6 @@
#include "RGBController_Crucial.h"
int RGBController_Crucial::GetMode()
{
return 0;
}
void RGBController_Crucial::SetMode(int mode)
{
mode = ((mode+1) << 4) | 0x0F;
crucial->SetMode(mode);
}
void RGBController_Crucial::SetCustomMode()
{
}
void RGBController_Crucial::UpdateLEDs()
{
crucial->SetAllColorsDirect(&colors[0]);
@@ -50,74 +34,74 @@ RGBController_Crucial::RGBController_Crucial(CrucialController * crucial_ptr)
mode Shift;
Shift.name = "Shift";
//Shift.value = CRUCIAL_MODE_SHIFT;
//Shift.flags = 0;
Shift.value = CRUCIAL_MODE_SHIFT;
Shift.flags = 0;
modes.push_back(Shift);
mode GradientShift;
GradientShift.name = "Gradient Shift";
//GradientShift.value = CRUCIAL_MODE_GRADIENT_SHIFT;
//GradientShift.flags = 0;
GradientShift.value = CRUCIAL_MODE_GRADIENT_SHIFT;
GradientShift.flags = 0;
modes.push_back(GradientShift);
mode Fill;
Fill.name = "Fill";
//Fill.value = CRUCIAL_MODE_FILL;
//Fill.flags = 0;
Fill.value = CRUCIAL_MODE_FILL;
Fill.flags = 0;
modes.push_back(Fill);
mode Stack;
Stack.name = "Stack";
//Stack.value = CRUCIAL_MODE_STACK;
//Stack.flags = 0;
Stack.value = CRUCIAL_MODE_STACK;
Stack.flags = 0;
modes.push_back(Stack);
mode DoubleStack;
DoubleStack.name = "Double Stack";
//DoubleStack.value = CRUCIAL_MODE_DOUBLE_STACK;
//DoubleStack.flags = 0;
DoubleStack.value = CRUCIAL_MODE_DOUBLE_STACK;
DoubleStack.flags = 0;
modes.push_back(DoubleStack);
mode Breathing;
Breathing.name = "Breathing";
//Breathing.value = CRUCIAL_MODE_BREATHING;
//Breathing.flags = 0;
Breathing.value = CRUCIAL_MODE_BREATHING;
Breathing.flags = 0;
modes.push_back(Breathing);
mode MotionPoint;
MotionPoint.name = "Motion Point";
//MotionPoint.value = CRUCIAL_MODE_MOTION_POINT;
//MotionPoint.flags = 0;
MotionPoint.value = CRUCIAL_MODE_MOTION_POINT;
MotionPoint.flags = 0;
modes.push_back(MotionPoint);
mode InsideOut;
InsideOut.name = "Inside Out";
//InsideOut.value = CRUCIAL_MODE_INSIDE_OUT;
//InsideOut.flags = 0;
InsideOut.value = CRUCIAL_MODE_INSIDE_OUT;
InsideOut.flags = 0;
modes.push_back(InsideOut);
mode ColorStep;
ColorStep.name = "Color Step";
//ColorStep.value = CRUCIAL_MODE_COLOR_STEP;
//ColorStep.flags = 0;
ColorStep.value = CRUCIAL_MODE_COLOR_STEP;
ColorStep.flags = 0;
modes.push_back(ColorStep);
mode WaterWave;
WaterWave.name = "Water Wave (Color Blending)";
//WaterWave.value = CRUCIAL_MODE_WATER_WAVE;
//WaterWave.flags = 0;
WaterWave.value = CRUCIAL_MODE_WATER_WAVE;
WaterWave.flags = 0;
modes.push_back(WaterWave);
mode Flashing;
Flashing.name = "Flashing";
//Flashing.value = CRUCIAL_MODE_FLASHING;
//Flashing.flags = 0;
Flashing.value = CRUCIAL_MODE_FLASHING;
Flashing.flags = 0;
modes.push_back(Flashing);
mode Static;
Static.name = "Static";
//Static.value = CRUCIAL_MODE_STATIC;
//Static.flags = 0;
Static.value = CRUCIAL_MODE_STATIC;
Static.flags = 0;
modes.push_back(Static);
zone new_zone;
@@ -141,3 +125,13 @@ RGBController_Crucial::RGBController_Crucial(CrucialController * crucial_ptr)
zones.push_back(new_zone);
}
void RGBController_Crucial::SetCustomMode()
{
active_mode = 0;
}
void RGBController_Crucial::UpdateMode()
{
crucial->SetMode(modes[active_mode].value);
}

6
RGBController/RGBController_Crucial.h
View File

@@ -16,13 +16,13 @@ class RGBController_Crucial : public RGBController
{
public:
RGBController_Crucial(CrucialController* crucial_ptr);
int GetMode();
void SetMode(int mode);
void SetCustomMode();
void UpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void UpdateMode();
private:
CrucialController* crucial;
};