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

Change all I2C/SMBus detectors to use RegisterRGBController

Browse source
This commit is contained in:
Adam Honse 2021-03-23 20:36:33 -05:00
parent f1d6c2953d
commit ec90f4678b
20 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp
View file

@ -44,7 +44,7 @@ bool TestForPolychromeSMBusController(i2c_smbus_interface* bus, unsigned char ad
* *
\******************************************************************************************/
void DetectPolychromeSMBusControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectPolychromeSMBusControllers(std::vector<i2c_smbus_interface*>& busses)
{
PolychromeController* new_polychrome;
RGBController_Polychrome* new_controller;
@ -61,7 +61,7 @@ void DetectPolychromeSMBusControllers(std::vector<i2c_smbus_interface*>& busses,
if(new_polychrome->GetASRockType() != ASROCK_TYPE_UNKNOWN)
{
new_controller = new RGBController_Polychrome(new_polychrome);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
else
{

4
Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp
View file

@ -63,7 +63,7 @@ bool TestForAsusAuraGPUController(i2c_smbus_interface* bus, unsigned char addres
* *
\******************************************************************************************/
void DetectAsusAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectAsusAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses)
{
AuraGPUController* new_aura_gpu;
RGBController_AuraGPU* new_controller;
@ -77,7 +77,7 @@ void DetectAsusAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std
{
new_aura_gpu = new AuraGPUController(busses[bus], aura_gpu_addresses[address_list_idx]);
new_controller = new RGBController_AuraGPU(new_aura_gpu);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
std::this_thread::sleep_for(1ms);

8
Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp
View file

@ -110,7 +110,7 @@ bool TestForAsusAuraSMBusController(i2c_smbus_interface* bus, unsigned char addr
/******************************************************************************************\
* *
* DetectAuraSMBusControllers *
* DetectAuraSMBusControllers *
* *
* Detect Aura controllers on the enumerated I2C busses. Searches for Aura-enabled *
* RAM at 0x77 and tries to initialize their slot addresses, then searches for them *
@ -122,7 +122,7 @@ bool TestForAsusAuraSMBusController(i2c_smbus_interface* bus, unsigned char addr
* *
\******************************************************************************************/
void DetectAsusAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectAsusAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses)
{
AuraSMBusController* new_aura;
RGBController_AuraSMBus* new_controller;
@ -171,7 +171,7 @@ void DetectAsusAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, s
{
new_aura = new AuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]);
new_controller = new RGBController_AuraSMBus(new_aura);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
std::this_thread::sleep_for(1ms);
@ -187,7 +187,7 @@ void DetectAsusAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, s
{
new_aura = new AuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]);
new_controller = new RGBController_AuraSMBus(new_aura);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
std::this_thread::sleep_for(1ms);

4
Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp
View file

@ -47,7 +47,7 @@ bool TestForCorsairDominatorPlatinumController(i2c_smbus_interface *bus, unsigne
* *
\******************************************************************************************/
void DetectCorsairDominatorPlatinumControllers(std::vector<i2c_smbus_interface *> &busses, std::vector<RGBController *> &rgb_controllers)
void DetectCorsairDominatorPlatinumControllers(std::vector<i2c_smbus_interface *> &busses)
{
for(unsigned int bus = 0; bus < busses.size(); bus++)
{
@ -59,7 +59,7 @@ void DetectCorsairDominatorPlatinumControllers(std::vector<i2c_smbus_interface *
{
CorsairDominatorPlatinumController* new_controller = new CorsairDominatorPlatinumController(busses[bus], addr);
RGBController_CorsairDominatorPlatinum* new_rgbcontroller = new RGBController_CorsairDominatorPlatinum(new_controller);
rgb_controllers.push_back(new_rgbcontroller);
ResourceManager::get()->RegisterRGBController(new_rgbcontroller);
}
std::this_thread::sleep_for(10ms);
}

18
Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp
View file

@ -52,7 +52,7 @@ bool TestForCorsairVengeanceController(i2c_smbus_interface* bus, unsigned char a
* *
\******************************************************************************************/
void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses)
{
CorsairVengeanceController* new_corsair;
RGBController_CorsairVengeance* new_controller;
@ -66,7 +66,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x58);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x59
@ -74,7 +74,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x59);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5A
@ -82,7 +82,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x5A);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5B
@ -90,7 +90,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x5B);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5C
@ -98,7 +98,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x5C);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5D
@ -106,7 +106,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x5D);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5E
@ -114,7 +114,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x5E);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5F
@ -122,7 +122,7 @@ void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses
{
new_corsair = new CorsairVengeanceController(busses[bus], 0x5F);
new_controller = new RGBController_CorsairVengeance(new_corsair);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

18
Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp
View file

@ -60,7 +60,7 @@ bool TestForCorsairVengeanceProController(i2c_smbus_interface* bus, unsigned cha
* *
\******************************************************************************************/
void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &busses)
{
CorsairVengeanceProController* new_corsair_pro;
RGBController_CorsairVengeancePro* new_controller;
@ -74,7 +74,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x58);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x59
@ -82,7 +82,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x59);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5A
@ -90,7 +90,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5A);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5B
@ -98,7 +98,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5B);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5C
@ -106,7 +106,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5C);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5D
@ -114,7 +114,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5D);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5E
@ -122,7 +122,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5E);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
// Check for Corsair controller at 0x5F
@ -130,7 +130,7 @@ void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &bus
{
new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5F);
new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/CrucialController/CrucialControllerDetect.cpp
View file

@ -83,7 +83,7 @@ void CrucialRegisterWrite(i2c_smbus_interface* bus, unsigned char dev, unsigned
* *
\******************************************************************************************/
void DetectCrucialControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectCrucialControllers(std::vector<i2c_smbus_interface*> &busses)
{
CrucialController* new_crucial;
RGBController_Crucial* new_controller;
@ -135,7 +135,7 @@ void DetectCrucialControllers(std::vector<i2c_smbus_interface*> &busses, std::ve
{
new_crucial = new CrucialController(busses[bus], crucial_addresses[address_list_idx]);
new_controller = new RGBController_Crucial(new_crucial);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

6
Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp
View file

@ -54,7 +54,7 @@ static const gpu_pci_device device_list[] =
* *
\******************************************************************************************/
void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses)
{
for (unsigned int bus = 0; bus < busses.size(); bus++)
{
@ -80,7 +80,7 @@ void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::ve
new_controller = new EVGAGPUv1Controller(busses[bus], 0x49);
new_rgbcontroller = new RGBController_EVGAGPUv1(new_controller);
new_rgbcontroller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_rgbcontroller);
ResourceManager::get()->RegisterRGBController(new_rgbcontroller);
}
break;
@ -92,7 +92,7 @@ void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::ve
new_controller = new EVGAGPUv2Controller(busses[bus], 0x49);
new_rgbcontroller = new RGBController_EVGAGPUv2(new_controller);
new_rgbcontroller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_rgbcontroller);
ResourceManager::get()->RegisterRGBController(new_rgbcontroller);
}
break;
}

4
Controllers/GainwardGPUController/GainwardGPUControllerDetect.cpp
View file

@ -61,7 +61,7 @@ bool TestForGainwardGPUController(i2c_smbus_interface* bus, unsigned char addres
* *
\******************************************************************************************/
void DetectGainwardGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectGainwardGPUControllers(std::vector<i2c_smbus_interface*> &busses)
{
GainwardGPUController* new_GainwardGPU;
RGBController_GainwardGPU* new_controller;
@ -81,7 +81,7 @@ void DetectGainwardGPUControllers(std::vector<i2c_smbus_interface*> &busses, std
new_GainwardGPU = new GainwardGPUController(busses[bus], 0x08);
new_controller = new RGBController_GainwardGPU(new_GainwardGPU);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp
View file

@ -67,7 +67,7 @@ bool TestForGalaxGPUController(i2c_smbus_interface* bus, unsigned char address)
* *
\******************************************************************************************/
void DetectGalaxGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectGalaxGPUControllers(std::vector<i2c_smbus_interface*> &busses)
{
GalaxGPUController* new_GalaxGPU;
RGBController_GalaxGPU* new_controller;
@ -87,7 +87,7 @@ void DetectGalaxGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::v
new_GalaxGPU = new GalaxGPUController(busses[bus], 0x23);
new_controller = new RGBController_GalaxGPU(new_GalaxGPU);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp
View file

@ -50,7 +50,7 @@ bool TestForGigabyteRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned
* *
\***********************************************************************************************/
void DetectGigabyteRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectGigabyteRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>& busses)
{
RGBFusion2DRAMController* new_rgb_fusion;
RGBController_RGBFusion2DRAM* new_controller;
@ -64,7 +64,7 @@ void DetectGigabyteRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>&
{
new_rgb_fusion = new RGBFusion2DRAMController(busses[bus], 0x67);
new_controller = new RGBController_RGBFusion2DRAM(new_rgb_fusion);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp
View file

@ -74,7 +74,7 @@ bool TestForGigabyteRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned
* *
\******************************************************************************************/
void DetectGigabyteRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectGigabyteRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>& busses)
{
RGBFusion2SMBusController* new_rgb_fusion;
RGBController_RGBFusion2SMBus* new_controller;
@ -123,7 +123,7 @@ void DetectGigabyteRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>&
{
new_rgb_fusion = new RGBFusion2SMBusController(busses[bus], 0x68, dmi.getMainboard() );
new_controller = new RGBController_RGBFusion2SMBus(new_rgb_fusion);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/GigabyteRGBFusionController/GigabyteRGBFusionControllerDetect.cpp
View file

@ -50,7 +50,7 @@ bool TestForGigabyteRGBFusionController(i2c_smbus_interface* bus, unsigned char
* *
\******************************************************************************************/
void DetectGigabyteRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectGigabyteRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses)
{
RGBFusionController* new_rgb_fusion;
RGBController_RGBFusion* new_controller;
@ -64,7 +64,7 @@ void DetectGigabyteRGBFusionControllers(std::vector<i2c_smbus_interface*>& busse
{
new_rgb_fusion = new RGBFusionController(busses[bus], 0x28);
new_controller = new RGBController_RGBFusion(new_rgb_fusion);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp
View file

@ -108,7 +108,7 @@ bool TestForGigabyteRGBFusionGPUController(i2c_smbus_interface* bus, unsigned ch
* *
\******************************************************************************************/
void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses)
{
RGBFusionGPUController* new_rgb_fusion;
RGBController_RGBFusionGPU* new_controller;
@ -128,7 +128,7 @@ void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& bu
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;
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp
View file

@ -55,7 +55,7 @@ bool TestForHyperXDRAMController(i2c_smbus_interface* bus, unsigned char address
* *
\******************************************************************************************/
void DetectHyperXDRAMControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectHyperXDRAMControllers(std::vector<i2c_smbus_interface*> &busses)
{
HyperXDRAMController* new_hyperx;
RGBController_HyperXDRAM* new_controller;
@ -112,7 +112,7 @@ void DetectHyperXDRAMControllers(std::vector<i2c_smbus_interface*> &busses, std:
new_controller->name = "HyperX Predator RGB";
}
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/MSIGPUController/MSIGPUControllerDetect.cpp
View file

@ -68,7 +68,7 @@ static const msi_gpu_pci_device device_list[] =
* *
\******************************************************************************************/
void DetectMSIGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectMSIGPUControllers(std::vector<i2c_smbus_interface*> &busses)
{
MSIGPUController* new_msi_gpu;
RGBController_MSIGPU* new_controller;
@ -90,7 +90,7 @@ void DetectMSIGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vec
new_msi_gpu = new MSIGPUController(busses[bus]);
new_controller = new RGBController_MSIGPU(new_msi_gpu);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

4
Controllers/PatriotViperController/PatriotViperControllerDetect.cpp
View file

@ -21,7 +21,7 @@ using namespace std::chrono_literals;
* *
\******************************************************************************************/
void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses)
{
PatriotViperController* new_viper;
RGBController_PatriotViper* new_controller;
@ -69,7 +69,7 @@ void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses, st
{
new_viper = new PatriotViperController(busses[bus], 0x77, slots_valid);
new_controller = new RGBController_PatriotViper(new_viper);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
}
}

6
Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp
View file

@ -89,7 +89,7 @@ bool TestForSapphireGPUController(i2c_smbus_interface* bus, unsigned char addres
* *
\******************************************************************************************/
void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface *> &busses, std::vector<RGBController *> &rgb_controllers)
void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface *> &busses)
{
for(unsigned int bus = 0; bus < busses.size(); bus++)
{
@ -108,7 +108,7 @@ void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface *> &busses, st
SapphireNitroGlowV1Controller* new_sapphire_gpu = new SapphireNitroGlowV1Controller(busses[bus], SAPPHIRE_NITRO_GLOW_V1_ADDR);
RGBController_SapphireNitroGlowV1* new_controller = new RGBController_SapphireNitroGlowV1(new_sapphire_gpu);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
break;
@ -118,7 +118,7 @@ void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface *> &busses, st
SapphireNitroGlowV3Controller* new_sapphire_gpu = new SapphireNitroGlowV3Controller(busses[bus], SAPPHIRE_NITRO_GLOW_V3_ADDR);
RGBController_SapphireNitroGlowV3* new_controller = new RGBController_SapphireNitroGlowV3(new_sapphire_gpu);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(new_controller);
}
break;
}

2
ResourceManager.cpp
View file

@ -524,7 +524,7 @@ void ResourceManager::DetectDevicesThreadFunction()
{
DetectionProgressChanged();
i2c_device_detectors[i2c_detector_idx](busses, rgb_controllers_hw);
i2c_device_detectors[i2c_detector_idx](busses);
}
/*-------------------------------------------------*\

8
ResourceManager.h
View file

@ -32,10 +32,10 @@
struct hid_device_info;
typedef std::function<void(std::vector<i2c_smbus_interface*>&)> I2CBusDetectorFunction;
typedef std::function<void(std::vector<RGBController*>&)> DeviceDetectorFunction;
typedef std::function<void(std::vector<i2c_smbus_interface*>&, std::vector<RGBController*>&)> I2CDeviceDetectorFunction;
typedef std::function<void(hid_device_info*, const std::string&)> HIDDeviceDetectorFunction;
typedef std::function<void(std::vector<i2c_smbus_interface*>&)> I2CBusDetectorFunction;
typedef std::function<void(std::vector<RGBController*>&)> DeviceDetectorFunction;
typedef std::function<void(std::vector<i2c_smbus_interface*>&)> I2CDeviceDetectorFunction;
typedef std::function<void(hid_device_info*, const std::string&)> HIDDeviceDetectorFunction;
typedef struct
{
std::string name;