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

Code cleanup round 4

Browse source
This commit is contained in:
Adam Honse 2022-01-18 20:20:22 -06:00
parent c09e4c9c92
commit c07f43c8d5
20 changed files with 988 additions and 992 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp
View file

@ -150,10 +150,7 @@ bool TestForGigabyteRGBFusionGPUController(i2c_smbus_interface* bus, unsigned ch
void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses)
{
RGBFusionGPUController* new_rgb_fusion;
RGBController_RGBFusionGPU* new_controller;
for (unsigned int bus = 0; bus < busses.size(); bus++)
for(unsigned int bus = 0; bus < busses.size(); bus++)
{
for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++)
{
@ -162,14 +159,16 @@ void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& bu
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
{
LOG_DEBUG(GPU_DETECT_MESSAGE, GIGABYTEGPU_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
LOG_DEBUG(GPU_DETECT_MESSAGE, GIGABYTEGPU_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name);
// Check for RGB Fusion controller
if (TestForGigabyteRGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address))
if(TestForGigabyteRGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address))
{
new_rgb_fusion = new RGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address);
new_controller = new RGBController_RGBFusionGPU(new_rgb_fusion);
new_controller->name = device_list[dev_idx].name;
ResourceManager::get()->RegisterRGBController(new_controller);
RGBFusionGPUController* controller = new RGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address);
RGBController_RGBFusionGPU* rgb_controller = new RGBController_RGBFusionGPU(controller);
rgb_controller->name = device_list[dev_idx].name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}
}

21
Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp
View file

@ -9,16 +9,15 @@
#include "RGBController_GigabyteRGBFusionGPU.h"
RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* rgb_fusion_ptr)
RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* controller_ptr)
{
rgb_fusion = rgb_fusion_ptr;
controller = controller_ptr;
name = "Gigabyte GPU";
vendor = "Gigabyte";
description = "RGB Fusion GPU";
location = rgb_fusion->GetDeviceLocation();
type = DEVICE_TYPE_GPU;
location = controller->GetDeviceLocation();
type = DEVICE_TYPE_GPU;
mode Direct;
Direct.name = "Direct";
@ -100,7 +99,7 @@ RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* r
RGBController_RGBFusionGPU::~RGBController_RGBFusionGPU()
{
delete rgb_fusion;
delete controller;
}
void RGBController_RGBFusionGPU::SetupZones()
@ -109,8 +108,8 @@ void RGBController_RGBFusionGPU::SetupZones()
| This device only has one LED, so create a single zone and |
| LED for it |
\*---------------------------------------------------------*/
zone* new_zone = new zone();
led* new_led = new led();
zone* new_zone = new zone();
led* new_led = new led();
new_zone->name = "GPU Zone";
new_zone->type = ZONE_TYPE_SINGLE;
@ -144,7 +143,7 @@ void RGBController_RGBFusionGPU::DeviceUpdateLEDs()
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
rgb_fusion->SetColor(red, grn, blu);
controller->SetColor(red, grn, blu);
}
void RGBController_RGBFusionGPU::UpdateZoneLEDs(int /*zone*/)
@ -164,11 +163,11 @@ void RGBController_RGBFusionGPU::SetCustomMode()
void RGBController_RGBFusionGPU::DeviceUpdateMode()
{
rgb_fusion->SetMode((unsigned char)modes[(unsigned int)active_mode].value, (unsigned char)modes[(unsigned int)active_mode].speed, (unsigned char)modes[(unsigned int)active_mode].brightness);
controller->SetMode((unsigned char)modes[(unsigned int)active_mode].value, (unsigned char)modes[(unsigned int)active_mode].speed, (unsigned char)modes[(unsigned int)active_mode].brightness);
}
void RGBController_RGBFusionGPU::DeviceSaveMode()
{
DeviceUpdateMode();
rgb_fusion->Save();
controller->Save();
}

4
Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h
View file

@ -15,7 +15,7 @@
class RGBController_RGBFusionGPU : public RGBController
{
public:
RGBController_RGBFusionGPU(RGBFusionGPUController* rgb_fusion_ptr);
RGBController_RGBFusionGPU(RGBFusionGPUController* controller_ptr);
~RGBController_RGBFusionGPU();
void SetupZones();
@ -31,5 +31,5 @@ public:
void DeviceSaveMode();
private:
RGBFusionGPUController* rgb_fusion;
RGBFusionGPUController* controller;
};