grayhook
/
OpenRGB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Gigabyte RGB Fusion 1.0 controller to new RGBController API

Browse Source
master
Adam Honse 6 years ago
parent f806f3ad66
commit 408020c244
4 changed files with 80 additions and 52 deletions
Show Stats Download Patch File Download Diff File

2
OpenRGB.cpp
Unescape Escape View File

@ -324,7 +324,7 @@ void DetectRGBControllers(void)
//DetectPolychromeControllers(busses, rgb_controllers);
DetectRGBFusionGPUControllers(busses, rgb_controllers);
//DetectRGBFusionControllers(busses, rgb_controllers);
DetectRGBFusionControllers(busses, rgb_controllers);
//DetectMSIRGBControllers(rgb_controllers);
//DetectLEDStripControllers(rgb_controllers);

8
OpenRGB.pro
Unescape Escape View File

@ -47,7 +47,7 @@ INCLUDEPATH += \
# Controllers/PatriotViperController/ \
# Controllers/PolychromeController/ \
# Controllers/PoseidonZRGBController/ \
# Controllers/RGBFusionController/ \
Controllers/RGBFusionController/ \
# Controllers/RGBFusion2Controller/ \
Controllers/RGBFusionGPUController/ \
Controllers/ThermaltakeRiingController/ \
@ -111,8 +111,8 @@ SOURCES += \
# Controllers/PolychromeController/PolychromeControllerDetect.cpp \
# Controllers/PoseidonZRGBController/PoseidonZRGBController.cpp \
# Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp \
# Controllers/RGBFusionController/RGBFusionController.cpp \
# Controllers/RGBFusionController/RGBFusionControllerDetect.cpp \
Controllers/RGBFusionController/RGBFusionController.cpp \
Controllers/RGBFusionController/RGBFusionControllerDetect.cpp \
# Controllers/RGBFusion2Controller/RGBFusion2Controller.cpp \
# Controllers/RGBFusion2Controller/RGBFusion2ControllerDetect.cpp \
Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp \
@ -141,7 +141,7 @@ SOURCES += \
# RGBController/RGBController_PatriotViper.cpp \
# RGBController/RGBController_Polychrome.cpp \
# RGBController/RGBController_PoseidonZRGB.cpp \
# RGBController/RGBController_RGBFusion.cpp \
RGBController/RGBController_RGBFusion.cpp \
# RGBController/RGBController_RGBFusion2.cpp \
RGBController/RGBController_RGBFusionGPU.cpp \
RGBController/RGBController_ThermaltakeRiing.cpp \

117
RGBController/RGBController_RGBFusion.cpp
Unescape Escape View File

@ -9,35 +9,6 @@
#include "RGBController_RGBFusion.h"
void RGBController_RGBFusion::UpdateLEDs()
{
for (std::size_t led = 0; led < colors.size(); led++)
{
RGBColor color = colors[led];
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
rgb_fusion->SetLEDColor(led, red, grn, blu);
}
}
void RGBController_RGBFusion::UpdateZoneLEDs(int zone)
{
RGBColor color = colors[zone];
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
rgb_fusion->SetLEDColor(zone, red, grn, blu);
}
void RGBController_RGBFusion::UpdateSingleLED(int led)
{
UpdateZoneLEDs(led);
}
static const char* rgb_fusion_zone_names[] =
{
"Motherboard",
@ -81,35 +52,87 @@ RGBController_RGBFusion::RGBController_RGBFusion(RGBFusionController* rgb_fusion
Flashing.color_mode = MODE_COLORS_PER_LED;
modes.push_back(Flashing);
colors.resize(rgb_fusion->GetLEDCount());
SetupZones();
// Search through all LEDs and create zones for each channel type
for (unsigned int i = 0; i < rgb_fusion->GetLEDCount(); i++)
// Initialize active mode
active_mode = GetDeviceMode();
}
void RGBController_RGBFusion::SetupZones()
{
/*---------------------------------------------------------*\
| Search through all LEDs and create zones for each channel |
| type |
\*---------------------------------------------------------*/
for(unsigned int zone_idx = 0; zone_idx < rgb_fusion->GetLEDCount(); zone_idx++)
{
zone* new_zone = new zone();
led* new_led = new led();
std::vector<int>* zone_row = new std::vector<int>();
// Set zone name to channel name
new_zone->name = rgb_fusion_zone_names[i];
new_led->name = rgb_fusion_zone_names[i];
/*---------------------------------------------------------*\
| Set zone name to channel name |
\*---------------------------------------------------------*/
new_zone->name = rgb_fusion_zone_names[zone_idx];
new_zone->leds_min = 1;
new_zone->leds_max = 1;
new_zone->leds_count = 1;
/*---------------------------------------------------------*\
| Push new zone to zones vector |
\*---------------------------------------------------------*/
zones.push_back(*new_zone);
}
zone_row->push_back(i);
for(unsigned int led_idx = 0; led_idx < zones.size(); led_idx++)
{
led* new_led = new led();
// Aura devices can be either single or linear, never matrix
// That means only one row is needed
new_zone->map.push_back(*zone_row);
/*---------------------------------------------------------*\
| Set LED name to channel name |
\*---------------------------------------------------------*/
new_led->name = rgb_fusion_zone_names[led_idx];
// Push new LED to LEDs vector
/*---------------------------------------------------------*\
| Push new LED to LEDs vector |
\*---------------------------------------------------------*/
leds.push_back(*new_led);
}
// Push new zone to zones vector
zones.push_back(*new_zone);
SetupColors();
}
void RGBController_RGBFusion::ResizeZone(int /*zone*/, int /*new_size*/)
{
/*---------------------------------------------------------*\
| This device does not support resizing zones |
\*---------------------------------------------------------*/
}
void RGBController_RGBFusion::UpdateLEDs()
{
for (std::size_t led = 0; led < colors.size(); led++)
{
RGBColor color = colors[led];
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
rgb_fusion->SetLEDColor(led, red, grn, blu);
}
}
// Initialize active mode
active_mode = GetDeviceMode();
void RGBController_RGBFusion::UpdateZoneLEDs(int zone)
{
RGBColor color = colors[zone];
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
rgb_fusion->SetLEDColor(zone, red, grn, blu);
}
void RGBController_RGBFusion::UpdateSingleLED(int led)
{
UpdateZoneLEDs(led);
}
int RGBController_RGBFusion::GetDeviceMode()

5
RGBController/RGBController_RGBFusion.h
Unescape Escape View File

@ -16,6 +16,11 @@ class RGBController_RGBFusion : public RGBController
{
public:
RGBController_RGBFusion(RGBFusionController* rgb_fusion_ptr);
void SetupZones();
void ResizeZone(int zone, int new_size);
void UpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);

Write Preview
Loading…
Cancel
Save