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

Store name in GigabyteRGBFusionGPUController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-10 00:27:45 -05:00
parent df56b42e62
commit 2535ac3edf
4 changed files with 85 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.cpp
View file

@ -11,10 +11,11 @@
#include "GigabyteRGBFusionGPUController.h"
RGBFusionGPUController::RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev)
RGBFusionGPUController::RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev, std::string dev_name)
{
this->bus = bus;
this->dev = dev;
this->name = dev_name;
}
RGBFusionGPUController::~RGBFusionGPUController()
@ -32,6 +33,11 @@ std::string RGBFusionGPUController::GetDeviceLocation()
return("I2C: " + return_string);
}
std::string RGBFusionGPUController::GetDeviceName()
{
return(name);
}
void RGBFusionGPUController::SetColor(unsigned char red, unsigned char green, unsigned char blue)
{
bus->i2c_smbus_write_byte(dev, RGB_FUSION_GPU_REG_COLOR);
@ -39,7 +45,9 @@ void RGBFusionGPUController::SetColor(unsigned char red, unsigned char green, un
bus->i2c_smbus_write_byte(dev, green);
bus->i2c_smbus_write_byte(dev, blue);
// Pad commands with 4 zero-bytes for NVIDIA_RTX3060_DEV
/*-----------------------------------------------------*\
| Pad commands with 4 zero-bytes for NVIDIA_RTX3060_DEV |
\*-----------------------------------------------------*/
if(dev == 0x62)
{
bus->i2c_smbus_write_byte(dev, 0x00);
@ -56,7 +64,9 @@ void RGBFusionGPUController::SetMode(unsigned char mode, unsigned char speed, un
bus->i2c_smbus_write_byte(dev, speed);
bus->i2c_smbus_write_byte(dev, brightness);
// Pad commands with 4 zero-bytes for NVIDIA_RTX3060_DEV
/*-----------------------------------------------------*\
| Pad commands with 4 zero-bytes for NVIDIA_RTX3060_DEV |
\*-----------------------------------------------------*/
if(dev == 0x62)
{
bus->i2c_smbus_write_byte(dev, 0x00);
@ -73,7 +83,9 @@ void RGBFusionGPUController::Save()
bus->i2c_smbus_write_byte(dev, 0x00);
bus->i2c_smbus_write_byte(dev, 0x00);
// Pad commands with 4 zero-bytes for NVIDIA_RTX3060_DEV
/*-----------------------------------------------------*\
| Pad commands with 4 zero-bytes for NVIDIA_RTX3060_DEV |
\*-----------------------------------------------------*/
if(dev == 0x62)
{
bus->i2c_smbus_write_byte(dev, 0x00);

5
Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.h
View file

@ -49,10 +49,11 @@ enum
class RGBFusionGPUController
{
public:
RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev);
RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev, std::string dev_name);
~RGBFusionGPUController();
std::string GetDeviceLocation();
std::string GetDeviceName();
void SetColor(unsigned char red, unsigned char green, unsigned char blue);
void SetMode(unsigned char mode, unsigned char speed, unsigned char brightness);
@ -61,5 +62,5 @@ public:
private:
i2c_smbus_interface* bus;
rgb_fusion_dev_id dev;
std::string name;
};

3
Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp
View file

@ -98,9 +98,8 @@ void DetectGigabyteRGBFusionGPUControllers(i2c_smbus_interface* bus, uint8_t i2c
// Check for RGB Fusion controller
if(TestForGigabyteRGBFusionGPUController(bus, i2c_addr))
{
RGBFusionGPUController* controller = new RGBFusionGPUController(bus, i2c_addr);
RGBFusionGPUController* controller = new RGBFusionGPUController(bus, i2c_addr, name);
RGBController_RGBFusionGPU* rgb_controller = new RGBController_RGBFusionGPU(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}

4
Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp
View file

@ -26,9 +26,9 @@ RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* c
{
controller = controller_ptr;
name = "Gigabyte GPU";
name = controller->GetDeviceName();
vendor = "Gigabyte";
description = "RGB Fusion GPU";
description = "RGB Fusion GPU Device";
location = controller->GetDeviceLocation();
type = DEVICE_TYPE_GPU;