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

Split RGBController classes into their own files

Browse source
This commit is contained in:
Adam Honse 2019-06-13 23:24:05 -05:00
parent 8c3acbe889
commit 90b57e1846
11 changed files with 238 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

92
OpenAuraSDK/AuraController.cpp
View file

@ -175,96 +175,4 @@ void AuraController::AuraRegisterWriteBlock(aura_register reg, unsigned char * d
//Write Aura block data
bus->i2c_smbus_write_block_data(dev, 0x03, sz, data);
}
int RGBController_Aura::GetMode()
{
if (aura->AuraRegisterRead(AURA_REG_DIRECT))
{
return(0);
}
else
{
return(aura->AuraRegisterRead(AURA_REG_MODE) + 1);
}
}
void RGBController_Aura::SetMode(int mode)
{
if (mode == 0)
{
aura->SetDirect(true);
}
else
{
aura->SetDirect(false);
aura->SetMode(mode - 1);
}
}
void RGBController_Aura::SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue)
{
if (GetMode() == 0)
{
aura->SetAllColorsDirect(red, green, blue);
}
else
{
aura->SetAllColorsEffect(red, green, blue);
}
}
RGBController_Aura::RGBController_Aura(AuraController* aura_ptr)
{
aura = aura_ptr;
name = aura->GetDeviceName();
mode aura_modes[AURA_NUMBER_MODES + 1];
aura_modes[0].name = "Direct";
aura_modes[1].name = "Off";
aura_modes[2].name = "Static";
aura_modes[3].name = "Breathing";
aura_modes[4].name = "Flashing";
aura_modes[5].name = "Spectrum Cycle";
aura_modes[6].name = "Rainbow";
aura_modes[7].name = "Spectrum Cycle Breathing";
aura_modes[8].name = "Chase Fade";
aura_modes[9].name = "Spectrum Cycle Chase Fade";
aura_modes[10].name = "Chase";
aura_modes[11].name = "Spectrum Cycle Chase";
aura_modes[12].name = "Spectrum Cycle Wave";
aura_modes[13].name = "Chase Rainbow Pulse";
aura_modes[14].name = "Random Flicker";
for (int i = 0; i < (AURA_NUMBER_MODES + 1); i++)
{
modes.push_back(aura_modes[i]);
}
for (int i = 0; i < aura->GetLEDCount(); i++)
{
led* new_led = new led();
new_led->name = "Aura LED";
leds.push_back(*new_led);
}
zone new_zone;
new_zone.name = "Aura Zone";
new_zone.type = ZONE_TYPE_LINEAR;
std::vector<int> zone_row;
for (int i = 0; i < aura->GetLEDCount(); i++)
{
zone_row.push_back(i);
}
new_zone.map.push_back(zone_row);
zones.push_back(new_zone);
}

12
OpenAuraSDK/AuraController.h
View file

@ -79,16 +79,4 @@ private:
i2c_smbus_interface * bus;
aura_dev_id dev;
};
class RGBController_Aura : public RGBController
{
public:
RGBController_Aura(AuraController* aura_ptr);
int GetMode();
void SetMode(int mode);
void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue);
private:
AuraController* aura;
};

58
OpenAuraSDK/CorsairController.cpp
View file

@ -46,62 +46,4 @@ void CorsairController::SetAllColorsDirect(unsigned char red, unsigned char gree
void CorsairController::SetMode(unsigned char mode)
{
bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_MODE, CORSAIR_VENGEANCE_RGB_MODE_SINGLE);
}
int RGBController_Corsair::GetMode()
{
return(CORSAIR_VENGEANCE_RGB_MODE_SINGLE);
}
void RGBController_Corsair::SetMode(int mode)
{
corsair->SetMode(mode);
}
void RGBController_Corsair::SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue)
{
corsair->SetAllColorsDirect(red, green, blue);
}
RGBController_Corsair::RGBController_Corsair(CorsairController* corsair_ptr)
{
corsair = corsair_ptr;
name = corsair->GetDeviceName();
mode corsair_modes[CORSAIR_NUMBER_MODES];
corsair_modes[0].name = "Static";
corsair_modes[1].name = "Fade";
corsair_modes[2].name = "Pulse";
for (int i = 0; i < CORSAIR_NUMBER_MODES; i++)
{
modes.push_back(corsair_modes[i]);
}
for (int i = 0; i < corsair->GetLEDCount(); i++)
{
led* new_led = new led();
new_led->name = "Corsair LED";
leds.push_back(*new_led);
}
zone new_zone;
new_zone.name = "Corsair Zone";
new_zone.type = ZONE_TYPE_SINGLE;
std::vector<int> zone_row;
for (int i = 0; i < corsair->GetLEDCount(); i++)
{
zone_row.push_back(i);
}
new_zone.map.push_back(zone_row);
zones.push_back(new_zone);
}

12
OpenAuraSDK/CorsairController.h
View file

@ -50,16 +50,4 @@ private:
unsigned int led_count;
i2c_smbus_interface * bus;
corsair_dev_id dev;
};
class RGBController_Corsair : public RGBController
{
public:
RGBController_Corsair(CorsairController* corsair_ptr);
int GetMode();
void SetMode(int mode);
void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue);
private:
CorsairController* corsair;
};

2
OpenAuraSDK/OpenAuraSDK.cpp
View file

@ -9,6 +9,8 @@
#include "AuraController.h"
#include "CorsairController.h"
#include "RGBController.h"
#include "RGBController_Aura.h"
#include "RGBController_Corsair.h"
#include "i2c_smbus.h"
#include <vector>
#include <stdio.h>

4
OpenAuraSDK/OpenAuraSDK.vcxproj
View file

@ -188,6 +188,8 @@
<ClInclude Include="OpenAuraSDKDialog.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="RGBController.h" />
<ClInclude Include="RGBController_Aura.h" />
<ClInclude Include="RGBController_Corsair.h" />
<ClInclude Include="wmi.h" />
</ItemGroup>
<ItemGroup>
@ -200,6 +202,8 @@
<ClCompile Include="i2c_smbus_nuvoton_nct6793d.cpp" />
<ClCompile Include="i2c_smbus_piix4.cpp" />
<ClCompile Include="OpenAuraSDKDialog.cpp" />
<ClCompile Include="RGBController_Aura.cpp" />
<ClCompile Include="RGBController_Corsair.cpp" />
<ClCompile Include="wmi.cpp" />
<ClCompile Include="OpenAuraSDK.cpp" />
</ItemGroup>

12
OpenAuraSDK/OpenAuraSDK.vcxproj.filters
View file

@ -51,6 +51,12 @@
<ClInclude Include="CorsairController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="RGBController_Aura.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="RGBController_Corsair.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="OpenAuraSDK.cpp">
@ -86,6 +92,12 @@
<ClCompile Include="CorsairController.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="RGBController_Aura.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="RGBController_Corsair.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Resource.rc">

102
OpenAuraSDK/RGBController_Aura.cpp Normal file
View file

@ -0,0 +1,102 @@
/*-----------------------------------------*\
| RGBController_Aura.cpp |
| |
| Generic RGB Interface for OpenAuraSDK |
| Asus Aura driver |
| |
| Adam Honse (CalcProgrammer1) 6/13/2019 |
\*-----------------------------------------*/
#include "RGBController_Aura.h"
int RGBController_Aura::GetMode()
{
if (aura->AuraRegisterRead(AURA_REG_DIRECT))
{
return(0);
}
else
{
return(aura->AuraRegisterRead(AURA_REG_MODE) + 1);
}
}
void RGBController_Aura::SetMode(int mode)
{
if (mode == 0)
{
aura->SetDirect(true);
}
else
{
aura->SetDirect(false);
aura->SetMode(mode - 1);
}
}
void RGBController_Aura::SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue)
{
if (GetMode() == 0)
{
aura->SetAllColorsDirect(red, green, blue);
}
else
{
aura->SetAllColorsEffect(red, green, blue);
}
}
RGBController_Aura::RGBController_Aura(AuraController * aura_ptr)
{
aura = aura_ptr;
name = aura->GetDeviceName();
mode aura_modes[AURA_NUMBER_MODES + 1];
aura_modes[0].name = "Direct";
aura_modes[1].name = "Off";
aura_modes[2].name = "Static";
aura_modes[3].name = "Breathing";
aura_modes[4].name = "Flashing";
aura_modes[5].name = "Spectrum Cycle";
aura_modes[6].name = "Rainbow";
aura_modes[7].name = "Spectrum Cycle Breathing";
aura_modes[8].name = "Chase Fade";
aura_modes[9].name = "Spectrum Cycle Chase Fade";
aura_modes[10].name = "Chase";
aura_modes[11].name = "Spectrum Cycle Chase";
aura_modes[12].name = "Spectrum Cycle Wave";
aura_modes[13].name = "Chase Rainbow Pulse";
aura_modes[14].name = "Random Flicker";
for (int i = 0; i < (AURA_NUMBER_MODES + 1); i++)
{
modes.push_back(aura_modes[i]);
}
for (int i = 0; i < aura->GetLEDCount(); i++)
{
led* new_led = new led();
new_led->name = "Aura LED";
leds.push_back(*new_led);
}
zone new_zone;
new_zone.name = "Aura Zone";
new_zone.type = ZONE_TYPE_LINEAR;
std::vector<int> zone_row;
for (int i = 0; i < aura->GetLEDCount(); i++)
{
zone_row.push_back(i);
}
new_zone.map.push_back(zone_row);
zones.push_back(new_zone);
}

25
OpenAuraSDK/RGBController_Aura.h Normal file
View file

@ -0,0 +1,25 @@
/*-----------------------------------------*\
| RGBController_Aura.h |
| |
| Generic RGB Interface for OpenAuraSDK |
| Asus Aura driver |
| |
| Adam Honse (CalcProgrammer1) 6/13/2019 |
\*-----------------------------------------*/
#pragma once
#include "RGBController.h"
#include "AuraController.h"
class RGBController_Aura : public RGBController
{
public:
RGBController_Aura(AuraController* aura_ptr);
int GetMode();
void SetMode(int mode);
void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue);
private:
AuraController* aura;
};

68
OpenAuraSDK/RGBController_Corsair.cpp Normal file
View file

@ -0,0 +1,68 @@
/*-----------------------------------------*\
| RGBController_Corsair.cpp |
| |
| Generic RGB Interface for OpenAuraSDK |
| Corsair Vengeance RGB driver |
| |
| Adam Honse (CalcProgrammer1) 6/13/2019 |
\*-----------------------------------------*/
#include "RGBController_Corsair.h"
int RGBController_Corsair::GetMode()
{
return(CORSAIR_VENGEANCE_RGB_MODE_SINGLE);
}
void RGBController_Corsair::SetMode(int mode)
{
corsair->SetMode(mode);
}
void RGBController_Corsair::SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue)
{
corsair->SetAllColorsDirect(red, green, blue);
}
RGBController_Corsair::RGBController_Corsair(CorsairController* corsair_ptr)
{
corsair = corsair_ptr;
name = corsair->GetDeviceName();
mode corsair_modes[CORSAIR_NUMBER_MODES];
corsair_modes[0].name = "Static";
corsair_modes[1].name = "Fade";
corsair_modes[2].name = "Pulse";
for (int i = 0; i < CORSAIR_NUMBER_MODES; i++)
{
modes.push_back(corsair_modes[i]);
}
for (int i = 0; i < corsair->GetLEDCount(); i++)
{
led* new_led = new led();
new_led->name = "Corsair LED";
leds.push_back(*new_led);
}
zone new_zone;
new_zone.name = "Corsair Zone";
new_zone.type = ZONE_TYPE_SINGLE;
std::vector<int> zone_row;
for (int i = 0; i < corsair->GetLEDCount(); i++)
{
zone_row.push_back(i);
}
new_zone.map.push_back(zone_row);
zones.push_back(new_zone);
}

25
OpenAuraSDK/RGBController_Corsair.h Normal file
View file

@ -0,0 +1,25 @@
/*-----------------------------------------*\
| RGBController_Corsair.h |
| |
| Generic RGB Interface for OpenAuraSDK |
| Corsair Vengeance RGB driver |
| |
| Adam Honse (CalcProgrammer1) 6/13/2019 |
\*-----------------------------------------*/
#pragma once
#include "RGBController.h"
#include "CorsairController.h"
class RGBController_Corsair : public RGBController
{
public:
RGBController_Corsair(CorsairController* corsair_ptr);
int GetMode();
void SetMode(int mode);
void SetAllLEDs(unsigned char red, unsigned char green, unsigned char blue);
private:
CorsairController* corsair;
};