diff --git a/Controllers/PolychromeController/PolychromeController.cpp b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp similarity index 99% rename from Controllers/PolychromeController/PolychromeController.cpp rename to Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp index 617cec31..14234365 100644 --- a/Controllers/PolychromeController/PolychromeController.cpp +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| PolychromeController.cpp | +| ASRockPolyChromeSMBusController.cpp | | | | Driver for for ASRock ASR LED and | | Polychrome RGB lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/14/2019 | \*-----------------------------------------*/ -#include "PolychromeController.h" +#include "ASRockPolyChromeSMBusController.h" #include using namespace std::chrono_literals; diff --git a/Controllers/PolychromeController/PolychromeController.h b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h similarity index 99% rename from Controllers/PolychromeController/PolychromeController.h rename to Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h index 0b509c55..f9a54671 100644 --- a/Controllers/PolychromeController/PolychromeController.h +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| PolychromeController.h | +| ASRockPolyChromeSMBusController.h | | | | Definitions and types for ASRock | | ASR LED and Polychrome RGB lighting | diff --git a/Controllers/PolychromeController/PolychromeControllerDetect.cpp b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp similarity index 78% rename from Controllers/PolychromeController/PolychromeControllerDetect.cpp rename to Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp index 0738a5ae..dcfb1f9c 100644 --- a/Controllers/PolychromeController/PolychromeControllerDetect.cpp +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "PolychromeController.h" +#include "ASRockPolyChromeSMBusController.h" #include "RGBController.h" -#include "RGBController_Polychrome.h" +#include "RGBController_ASRockPolyChromeSMBus.h" #include "i2c_smbus.h" #include "pci_ids.h" #include @@ -10,14 +10,14 @@ /******************************************************************************************\ * * -* TestForPolychromeController * +* TestForPolychromeSMBusController * * * * Tests the given address to see if an ASRock Polychrome RGB controller exists there.* * First does a quick write to test for a response * * * \******************************************************************************************/ -bool TestForPolychromeController(i2c_smbus_interface* bus, unsigned char address) +bool TestForPolychromeSMBusController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; @@ -36,15 +36,15 @@ bool TestForPolychromeController(i2c_smbus_interface* bus, unsigned char address * * * DetectPolychromeControllers * * * -* Detect ASRock Polychrome RGB controllers on the enumerated I2C busses at address * -* 0x6A. * +* Detect ASRock Polychrome RGB SMBus controllers on the enumerated I2C busses at * +* address 0x6A. * * * * bus - pointer to i2c_smbus_interface where Polychrome device is connected * * dev - I2C address of Polychrome device * * * \******************************************************************************************/ -void DetectPolychromeControllers(std::vector& busses, std::vector& rgb_controllers) +void DetectPolychromeSMBusControllers(std::vector& busses, std::vector& rgb_controllers) { PolychromeController* new_polychrome; RGBController_Polychrome* new_controller; @@ -54,7 +54,7 @@ void DetectPolychromeControllers(std::vector& busses, std: IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) { // Check for Polychrome controller at 0x6A - if (TestForPolychromeController(busses[bus], 0x6A)) + if (TestForPolychromeSMBusController(busses[bus], 0x6A)) { new_polychrome = new PolychromeController(busses[bus], 0x6A); @@ -71,6 +71,6 @@ void DetectPolychromeControllers(std::vector& busses, std: } } -} /* DetectPolychromeControllers() */ +} /* DetectSMBusPolychromeControllers() */ -REGISTER_I2C_DETECTOR("ASRock Polychrome", DetectPolychromeControllers); +REGISTER_I2C_DETECTOR("ASRock Polychrome SMBus", DetectPolychromeSMBusControllers); diff --git a/Controllers/PolychromeController/RGBController_Polychrome.cpp b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp similarity index 99% rename from Controllers/PolychromeController/RGBController_Polychrome.cpp rename to Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp index 4ffb69c0..01cc66fc 100644 --- a/Controllers/PolychromeController/RGBController_Polychrome.cpp +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_Polychrome.cpp | +| ASRockSMBusRGBController_Polychrome.cpp | | | | Generic RGB Interface for OpenRGB | | ASRock ASR LED and Polychrome RGB Driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/15/2019 | \*-----------------------------------------*/ -#include "RGBController_Polychrome.h" +#include "RGBController_ASRockPolychromeSMBus.h" #define ASROCK_MAX_ZONES 4 #define ASROCK_MAX_LEDS 22 diff --git a/Controllers/PolychromeController/RGBController_Polychrome.h b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h similarity index 90% rename from Controllers/PolychromeController/RGBController_Polychrome.h rename to Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h index b106b17b..7361a7ca 100644 --- a/Controllers/PolychromeController/RGBController_Polychrome.h +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_Polychrome.h | +| RGBController_ASRockPolyChromeSMBus.h | | | | Generic RGB Interface for OpenRGB | | ASRock ASR LED and Polychrome RGB Driver | @@ -10,7 +10,7 @@ #pragma once #include "RGBController.h" -#include "PolychromeController.h" +#include "ASRockPolyChromeSMBusController.h" class RGBController_Polychrome : public RGBController { diff --git a/Controllers/AuraCoreController/AuraCoreController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp similarity index 98% rename from Controllers/AuraCoreController/AuraCoreController.cpp rename to Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp index b37d1967..989c3ba9 100644 --- a/Controllers/AuraCoreController/AuraCoreController.cpp +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraCoreController.cpp | +| AsusAuraCoreController.cpp | | | | Driver for ASUS ROG Aura Core RGB | | lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 4/13/2020 | \*-----------------------------------------*/ -#include "AuraCoreController.h" +#include "AsusAuraCoreController.h" #include AuraCoreController::AuraCoreController(hid_device* dev_handle) diff --git a/Controllers/AuraCoreController/AuraCoreController.h b/Controllers/AsusAuraCoreController/AsusAuraCoreController.h similarity index 98% rename from Controllers/AuraCoreController/AuraCoreController.h rename to Controllers/AsusAuraCoreController/AsusAuraCoreController.h index d71ddaff..71348d3c 100644 --- a/Controllers/AuraCoreController/AuraCoreController.h +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraCoreController.h | +| AsusAuraCoreController.h | | | | Definitions and types for ASUS ROG Aura | | Core RGB lighting controller | diff --git a/Controllers/AuraCoreController/AuraCoreControllerDetect.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp similarity index 85% rename from Controllers/AuraCoreController/AuraCoreControllerDetect.cpp rename to Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp index dda7ca86..0d3522a5 100644 --- a/Controllers/AuraCoreController/AuraCoreControllerDetect.cpp +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "AuraCoreController.h" +#include "AsusAuraCoreController.h" #include "RGBController.h" -#include "RGBController_AuraCore.h" +#include "RGBController_AsusAuraCore.h" #include #include @@ -23,7 +23,7 @@ static const unsigned short pid_table[] = * * \******************************************************************************************/ -void DetectAuraCoreControllers(std::vector& rgb_controllers) +void DetectAsusAuraCoreControllers(std::vector& rgb_controllers) { hid_device* dev; @@ -45,4 +45,4 @@ void DetectAuraCoreControllers(std::vector& rgb_controllers) } } -REGISTER_DETECTOR("ASUS Aura Core", DetectAuraCoreControllers); +REGISTER_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers); diff --git a/Controllers/AuraCoreController/RGBController_AuraCore.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp similarity index 97% rename from Controllers/AuraCoreController/RGBController_AuraCore.cpp rename to Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp index 3cd114a3..d101b55c 100644 --- a/Controllers/AuraCoreController/RGBController_AuraCore.cpp +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp @@ -1,12 +1,12 @@ /*-----------------------------------------*\ -| RGBController_AuraCore.cpp | +| RGBController_AsusAuraCore.cpp | | | | Generic RGB Interface for ROG Aura Core | | | | Adam Honse (CalcProgrammer1) 4/17/2020 | \*-----------------------------------------*/ -#include "RGBController_AuraCore.h" +#include "RGBController_AsusAuraCore.h" RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr) { diff --git a/Controllers/AuraCoreController/RGBController_AuraCore.h b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h similarity index 90% rename from Controllers/AuraCoreController/RGBController_AuraCore.h rename to Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h index e32e6559..d1150597 100644 --- a/Controllers/AuraCoreController/RGBController_AuraCore.h +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraCore.h | +| RGBController_AsusAuraCore.h | | | | Generic RGB Interface for ROG Aura Core | | | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" -#include "AuraCoreController.h" +#include "AsusAuraCoreController.h" class RGBController_AuraCore : public RGBController { diff --git a/Controllers/AuraGPUController/AuraGPUController.cpp b/Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp similarity index 96% rename from Controllers/AuraGPUController/AuraGPUController.cpp rename to Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp index 4ee33c67..1e7920b7 100644 --- a/Controllers/AuraGPUController/AuraGPUController.cpp +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp @@ -1,12 +1,12 @@ /*-----------------------------------------*\ -| AuraGPUController.cpp | +| AsusAuraGPUController.cpp | | | | Driver for ASUS Aura RGB on GPUs | | | | Jan Rettig (Klapstuhl) 14.02.2020 | \*-----------------------------------------*/ -#include "AuraGPUController.h" +#include "AsusAuraGPUController.h" #include AuraGPUController::AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id dev) diff --git a/Controllers/AuraGPUController/AuraGPUController.h b/Controllers/AsusAuraGPUController/AsusAuraGPUController.h similarity index 98% rename from Controllers/AuraGPUController/AuraGPUController.h rename to Controllers/AsusAuraGPUController/AsusAuraGPUController.h index 9d835e6e..4ab07e34 100644 --- a/Controllers/AuraGPUController/AuraGPUController.h +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraGPUController.h | +| AsusAuraGPUController.h | | | | Definitions for ASUS Aura RGB on GPUs | | | diff --git a/Controllers/AuraGPUController/AuraGPUControllerDetect.cpp b/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp similarity index 86% rename from Controllers/AuraGPUController/AuraGPUControllerDetect.cpp rename to Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp index 3d98a86c..e1137189 100644 --- a/Controllers/AuraGPUController/AuraGPUControllerDetect.cpp +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraGPUControllerDetect.cpp | +| AsusAuraGPUControllerDetect.cpp | | | | Driver for ASUS Aura RGB on GPUs | | | @@ -7,9 +7,9 @@ \*-----------------------------------------*/ #include "Detector.h" -#include "AuraGPUController.h" +#include "AsusAuraGPUController.h" #include "RGBController.h" -#include "RGBController_AuraGPU.h" +#include "RGBController_AsusAuraGPU.h" #include "i2c_smbus.h" #include #include @@ -38,7 +38,7 @@ static const unsigned char aura_gpu_addresses[] = * * \******************************************************************************************/ -bool TestForAuraGPUController(i2c_smbus_interface* bus, unsigned char address) +bool TestForAsusAuraGPUController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; @@ -63,7 +63,7 @@ bool TestForAuraGPUController(i2c_smbus_interface* bus, unsigned char address) * * \******************************************************************************************/ -void DetectAuraGPUControllers(std::vector &busses, std::vector &rgb_controllers) +void DetectAsusAuraGPUControllers(std::vector &busses, std::vector &rgb_controllers) { AuraGPUController* new_aura_gpu; RGBController_AuraGPU* new_controller; @@ -73,7 +73,7 @@ void DetectAuraGPUControllers(std::vector &busses, std::ve // Add Aura-enabled GPU controllers for (unsigned int address_list_idx = 0; address_list_idx < AURA_GPU_ADDRESS_COUNT; address_list_idx++) { - if (TestForAuraGPUController(busses[bus], aura_gpu_addresses[address_list_idx])) + if (TestForAsusAuraGPUController(busses[bus], aura_gpu_addresses[address_list_idx])) { new_aura_gpu = new AuraGPUController(busses[bus], aura_gpu_addresses[address_list_idx]); new_controller = new RGBController_AuraGPU(new_aura_gpu); @@ -85,4 +85,4 @@ void DetectAuraGPUControllers(std::vector &busses, std::ve } } /* DetectAuraGPUControllers() */ -REGISTER_I2C_DETECTOR("ASUS Aura GPU", DetectAuraGPUControllers); +REGISTER_I2C_DETECTOR("ASUS Aura GPU", DetectAsusAuraGPUControllers); diff --git a/Controllers/AuraGPUController/RGBController_AuraGPU.cpp b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp similarity index 98% rename from Controllers/AuraGPUController/RGBController_AuraGPU.cpp rename to Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp index 8f7cc105..a3dbc52f 100644 --- a/Controllers/AuraGPUController/RGBController_AuraGPU.cpp +++ b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp @@ -1,12 +1,12 @@ /*-----------------------------------------*\ -| RGBController_AuraGPU.h | +| RGBController_AsusAuraGPU.h | | | | Generic RGB Interface for Asus Aura GPU | | | | Jan Rettig (Klapstuhl) 14.02.2020 | \*-----------------------------------------*/ -#include "RGBController_AuraGPU.h" +#include "RGBController_AsusAuraGPU.h" int RGBController_AuraGPU::GetDeviceMode() { diff --git a/Controllers/AuraGPUController/RGBController_AuraGPU.h b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h similarity index 90% rename from Controllers/AuraGPUController/RGBController_AuraGPU.h rename to Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h index 39772fc7..c13e5a93 100644 --- a/Controllers/AuraGPUController/RGBController_AuraGPU.h +++ b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraGPU.h | +| RGBController_AsusAuraGPU.h | | | | Generic RGB Interface for Asus Aura GPU | | | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" -#include "AuraGPUController.h" +#include "AsusAuraGPUController.h" class RGBController_AuraGPU : public RGBController { diff --git a/Controllers/AuraSMBusController/AuraSMBusController.cpp b/Controllers/AsusAuraSMBusController/AsusAuraSMBusController.cpp similarity index 98% rename from Controllers/AuraSMBusController/AuraSMBusController.cpp rename to Controllers/AsusAuraSMBusController/AsusAuraSMBusController.cpp index 073902da..b342e10f 100644 --- a/Controllers/AuraSMBusController/AuraSMBusController.cpp +++ b/Controllers/AsusAuraSMBusController/AsusAuraSMBusController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraSMBusController.cpp | +| AsusAuraSMBusController.cpp | | | | Driver for ASUS Aura RGB lighting | | controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 8/19/2018 | \*-----------------------------------------*/ -#include "AuraSMBusController.h" +#include "AsusAuraSMBusController.h" #include static const char* aura_channels[] = /* Aura channel strings */ diff --git a/Controllers/AuraSMBusController/AuraSMBusController.h b/Controllers/AsusAuraSMBusController/AsusAuraSMBusController.h similarity index 99% rename from Controllers/AuraSMBusController/AuraSMBusController.h rename to Controllers/AsusAuraSMBusController/AsusAuraSMBusController.h index 92c82d7e..36961887 100644 --- a/Controllers/AuraSMBusController/AuraSMBusController.h +++ b/Controllers/AsusAuraSMBusController/AsusAuraSMBusController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraSMBusController.h | +| AsusAuraSMBusController.h | | | | Definitions and types for ASUS Aura RGB | | lighting controller | diff --git a/Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp b/Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp similarity index 88% rename from Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp rename to Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp index 2211bbe7..799ff13b 100644 --- a/Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp +++ b/Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "AuraSMBusController.h" +#include "AsusAuraSMBusController.h" #include "RGBController.h" -#include "RGBController_AuraSMBus.h" +#include "RGBController_AsusAuraSMBus.h" #include "i2c_smbus.h" #include "pci_ids.h" #include @@ -64,7 +64,7 @@ static const unsigned char aura_mobo_addresses[] = * * \******************************************************************************************/ -void AuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register reg, unsigned char val) +void AsusAuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register reg, unsigned char val) { //Write Aura register bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF)); @@ -83,7 +83,7 @@ void AuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register * * \******************************************************************************************/ -bool TestForAuraSMBusController(i2c_smbus_interface* bus, unsigned char address) +bool TestForAsusAuraSMBusController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; @@ -122,7 +122,7 @@ bool TestForAuraSMBusController(i2c_smbus_interface* bus, unsigned char address) * * \******************************************************************************************/ -void DetectAuraSMBusControllers(std::vector &busses, std::vector &rgb_controllers) +void DetectAsusAuraSMBusControllers(std::vector &busses, std::vector &rgb_controllers) { AuraSMBusController* new_aura; RGBController_AuraSMBus* new_controller; @@ -159,15 +159,15 @@ void DetectAuraSMBusControllers(std::vector &busses, std:: if(address_list_idx < AURA_RAM_ADDRESS_COUNT) { - AuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot); - AuraRegisterWrite(busses[bus], 0x77, AURA_REG_I2C_ADDRESS, (aura_ram_addresses[address_list_idx] << 1)); + AsusAuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot); + AsusAuraRegisterWrite(busses[bus], 0x77, AURA_REG_I2C_ADDRESS, (aura_ram_addresses[address_list_idx] << 1)); } } // Add Aura-enabled controllers at their remapped addresses for (unsigned int address_list_idx = 0; address_list_idx < AURA_RAM_ADDRESS_COUNT; address_list_idx++) { - if (TestForAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx])) + if (TestForAsusAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx])) { new_aura = new AuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]); new_controller = new RGBController_AuraSMBus(new_aura); @@ -183,7 +183,7 @@ void DetectAuraSMBusControllers(std::vector &busses, std:: { for (unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++) { - if (TestForAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx])) + if (TestForAsusAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx])) { new_aura = new AuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]); new_controller = new RGBController_AuraSMBus(new_aura); @@ -197,4 +197,4 @@ void DetectAuraSMBusControllers(std::vector &busses, std:: } /* DetectAuraSMBusControllers() */ -REGISTER_I2C_DETECTOR("ASUS Aura SMBus", DetectAuraSMBusControllers); +REGISTER_I2C_DETECTOR("ASUS Aura SMBus", DetectAsusAuraSMBusControllers); diff --git a/Controllers/AuraSMBusController/RGBController_AuraSMBus.cpp b/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp similarity index 99% rename from Controllers/AuraSMBusController/RGBController_AuraSMBus.cpp rename to Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp index 0fb8ba11..5b31d6f1 100644 --- a/Controllers/AuraSMBusController/RGBController_AuraSMBus.cpp +++ b/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraSMBus.cpp | +| RGBController_AsusAuraSMBus.cpp | | | | Generic RGB Interface for OpenAuraSDK | | Asus Aura SMBus driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 6/13/2019 | \*-----------------------------------------*/ -#include "RGBController_AuraSMBus.h" +#include "RGBController_AsusAuraSMBus.h" int RGBController_AuraSMBus::GetDeviceMode() { diff --git a/Controllers/AuraSMBusController/RGBController_AuraSMBus.h b/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.h similarity index 91% rename from Controllers/AuraSMBusController/RGBController_AuraSMBus.h rename to Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.h index f49e16ba..1ee181ba 100644 --- a/Controllers/AuraSMBusController/RGBController_AuraSMBus.h +++ b/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraSMBus.h | +| RGBController_AsusAuraSMBus.h | | | | Generic RGB Interface for OpenAuraSDK | | Asus Aura SMBus driver | @@ -10,7 +10,7 @@ #pragma once #include "RGBController.h" -#include "AuraSMBusController.h" +#include "AsusAuraSMBusController.h" class RGBController_AuraSMBus : public RGBController { diff --git a/Controllers/AuraUSBController/AuraAddressableController.cpp b/Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp similarity index 97% rename from Controllers/AuraUSBController/AuraAddressableController.cpp rename to Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp index d78d98d2..66cf0423 100644 --- a/Controllers/AuraUSBController/AuraAddressableController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraAddressableController.cpp | +| AsusAuraAddressableController.cpp | | | | Driver for ASUS Aura RGB Addressable | | lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 1/18/2020 | \*-----------------------------------------*/ -#include "AuraAddressableController.h" +#include "AsusAuraAddressableController.h" #include AuraAddressableController::AuraAddressableController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path) diff --git a/Controllers/AuraUSBController/AuraAddressableController.h b/Controllers/AsusAuraUSBController/AsusAuraAddressableController.h similarity index 94% rename from Controllers/AuraUSBController/AuraAddressableController.h rename to Controllers/AsusAuraUSBController/AsusAuraAddressableController.h index bcfae8f0..f324219c 100644 --- a/Controllers/AuraUSBController/AuraAddressableController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraAddressableController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraAddressableController.h | +| AsusAuraAddressableController.h | | | | Definitions and types for ASUS Aura | | Addressable RGB lighting controller | @@ -8,7 +8,7 @@ \*-----------------------------------------*/ #include "RGBController.h" -#include "AuraUSBController.h" +#include "AsusAuraUSBController.h" #include #include diff --git a/Controllers/AuraUSBController/AuraMainboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp similarity index 98% rename from Controllers/AuraUSBController/AuraMainboardController.cpp rename to Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp index ea9da672..dc48a094 100644 --- a/Controllers/AuraUSBController/AuraMainboardController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraMainboardController.cpp | +| AsusAuraMainboardController.cpp | | | | Driver for ASUS Aura RGB USB mainboard | | lighting controller | @@ -7,7 +7,7 @@ | Martin Hartl (inlart) 4/25/2020 | \*-----------------------------------------*/ -#include "AuraMainboardController.h" +#include "AsusAuraMainboardController.h" #include AuraMainboardController::AuraMainboardController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path), mode(AURA_MODE_DIRECT) diff --git a/Controllers/AuraUSBController/AuraMainboardController.h b/Controllers/AsusAuraUSBController/AsusAuraMainboardController.h similarity index 95% rename from Controllers/AuraUSBController/AuraMainboardController.h rename to Controllers/AsusAuraUSBController/AsusAuraMainboardController.h index ea6b3290..19087433 100644 --- a/Controllers/AuraUSBController/AuraMainboardController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraMainboardController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraMainboardController.h | +| AsusAuraMainboardController.h | | | | Definitions and types for ASUS Aura | | USB Mainboard RGB lighting controller | @@ -8,7 +8,7 @@ \*-----------------------------------------*/ #include "RGBController.h" -#include "AuraUSBController.h" +#include "AsusAuraUSBController.h" #include #include diff --git a/Controllers/AuraUSBController/AuraMouseController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp similarity index 95% rename from Controllers/AuraUSBController/AuraMouseController.cpp rename to Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp index 1f40356a..2e333d60 100644 --- a/Controllers/AuraUSBController/AuraMouseController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraMouseController.cpp | +| AsusAuraMouseController.cpp | | | | Driver for ASUS Aura RGB USB | | lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 10/23/2020 | \*-----------------------------------------*/ -#include "AuraMouseController.h" +#include "AsusAuraMouseController.h" #include diff --git a/Controllers/AuraUSBController/AuraMouseController.h b/Controllers/AsusAuraUSBController/AsusAuraMouseController.h similarity index 96% rename from Controllers/AuraUSBController/AuraMouseController.h rename to Controllers/AsusAuraUSBController/AsusAuraMouseController.h index 31d6ffa4..3f06a7cc 100644 --- a/Controllers/AuraUSBController/AuraMouseController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraMouseController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraMouseController.h | +| AsusAuraMouseController.h | | | | Definitions and types for ASUS Aura | | USB RGB lighting controller | diff --git a/Controllers/AuraUSBController/AuraUSBController.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp similarity index 98% rename from Controllers/AuraUSBController/AuraUSBController.cpp rename to Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp index cdbe3616..34649253 100644 --- a/Controllers/AuraUSBController/AuraUSBController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraUSBController.cpp | +| AsusAuraUSBController.cpp | | | | Driver for ASUS Aura RGB USB | | lighting controller | @@ -7,7 +7,7 @@ | Martin Hartl (inlart) 4/25/2020 | \*-----------------------------------------*/ -#include "AuraUSBController.h" +#include "AsusAuraUSBController.h" #include #include diff --git a/Controllers/AuraUSBController/AuraUSBController.h b/Controllers/AsusAuraUSBController/AsusAuraUSBController.h similarity index 98% rename from Controllers/AuraUSBController/AuraUSBController.h rename to Controllers/AsusAuraUSBController/AsusAuraUSBController.h index 3c723779..f0e72d68 100644 --- a/Controllers/AuraUSBController/AuraUSBController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AuraUSBController.h | +| AsusAuraUSBController.h | | | | Definitions and types for ASUS Aura | | USB RGB lighting controller | diff --git a/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp similarity index 94% rename from Controllers/AuraUSBController/AuraUSBControllerDetect.cpp rename to Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index 40b0a668..7d47bac3 100644 --- a/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -1,10 +1,10 @@ #include "Detector.h" -#include "AuraAddressableController.h" -#include "AuraMainboardController.h" -#include "AuraMouseController.h" +#include "AsusAuraAddressableController.h" +#include "AsusAuraMainboardController.h" +#include "AsusAuraMouseController.h" #include "RGBController.h" -#include "RGBController_AuraUSB.h" -#include "RGBController_AuraMouse.h" +#include "RGBController_AsusAuraUSB.h" +#include "RGBController_AsusAuraMouse.h" #include #include #include @@ -63,7 +63,7 @@ static const aura_device mouse_device_list[] = { AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PID, 2, "ASUS ROG Gladius II Origin" }, }; -void DetectAuraUSBControllers(std::vector& rgb_controllers) +void DetectAsusAuraUSBControllers(std::vector& rgb_controllers) { hid_device_info* info = NULL; @@ -167,4 +167,4 @@ void DetectAuraUSBControllers(std::vector& rgb_controllers) } /* DetectAuraUSBControllers() */ -REGISTER_DETECTOR("ASUS Aura USB", DetectAuraUSBControllers); +REGISTER_DETECTOR("ASUS Aura USB", DetectAsusAuraUSBControllers); diff --git a/Controllers/AuraUSBController/RGBController_AuraMouse.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp similarity index 98% rename from Controllers/AuraUSBController/RGBController_AuraMouse.cpp rename to Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp index 4b061187..22eeca20 100644 --- a/Controllers/AuraUSBController/RGBController_AuraMouse.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraMouse.cpp | +| RGBController_AsusAuraMouse.cpp | | | | Generic RGB Interface for Asus Aura | | USB controller driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 10/25/2020 | \*-----------------------------------------*/ -#include "RGBController_AuraMouse.h" +#include "RGBController_AsusAuraMouse.h" RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* aura_ptr) { diff --git a/Controllers/AuraUSBController/RGBController_AuraMouse.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h similarity index 90% rename from Controllers/AuraUSBController/RGBController_AuraMouse.h rename to Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h index 3cf3d654..766aa8da 100644 --- a/Controllers/AuraUSBController/RGBController_AuraMouse.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraMouse.h | +| RGBController_AsusAuraMouse.h | | | | Generic RGB Interface for Asus Aura | | USB controller driver | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" -#include "AuraMouseController.h" +#include "AsusAuraMouseController.h" class RGBController_AuraMouse : public RGBController { diff --git a/Controllers/AuraUSBController/RGBController_AuraUSB.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp similarity index 98% rename from Controllers/AuraUSBController/RGBController_AuraUSB.cpp rename to Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp index e7fc3752..1bb60df0 100644 --- a/Controllers/AuraUSBController/RGBController_AuraUSB.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraUSB.cpp | +| RGBController_AsusAuraUSB.cpp | | | | Generic RGB Interface for Asus Aura | | USB controller driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 1/18/2020 | \*-----------------------------------------*/ -#include "RGBController_AuraUSB.h" +#include "RGBController_AsusAuraUSB.h" RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* aura_ptr) { diff --git a/Controllers/AuraUSBController/RGBController_AuraUSB.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h similarity index 92% rename from Controllers/AuraUSBController/RGBController_AuraUSB.h rename to Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h index dffe2122..fa983e63 100644 --- a/Controllers/AuraUSBController/RGBController_AuraUSB.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_AuraUSB.h | +| RGBController_AsusAuraUSB.h | | | | Generic RGB Interface for Asus Aura | | USB controller driver | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" -#include "AuraUSBController.h" +#include "AsusAuraUSBController.h" #define AURA_ADDRESSABLE_MAX_LEDS 120 diff --git a/Controllers/AorusCPUCoolerController/ATC800Controller.cpp b/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp similarity index 100% rename from Controllers/AorusCPUCoolerController/ATC800Controller.cpp rename to Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp diff --git a/Controllers/AorusCPUCoolerController/ATC800Controller.h b/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.h similarity index 100% rename from Controllers/AorusCPUCoolerController/ATC800Controller.h rename to Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.h diff --git a/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp b/Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp similarity index 97% rename from Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp rename to Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp index 19fd941b..454a01e7 100644 --- a/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp +++ b/Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp @@ -84,4 +84,4 @@ void DetectAorusCPUCoolerControllers(std::vector& rgb_controller } } -REGISTER_DETECTOR("Aorus CPU Coolers", DetectAorusCPUCoolerControllers); +REGISTER_DETECTOR("Gigabyte Aorus CPU Coolers", DetectAorusCPUCoolerControllers); diff --git a/Controllers/AorusCPUCoolerController/RGBController_AorusATC800.cpp b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp similarity index 100% rename from Controllers/AorusCPUCoolerController/RGBController_AorusATC800.cpp rename to Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp diff --git a/Controllers/AorusCPUCoolerController/RGBController_AorusATC800.h b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h similarity index 100% rename from Controllers/AorusCPUCoolerController/RGBController_AorusATC800.h rename to Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h diff --git a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp similarity index 96% rename from Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp rename to Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp index d8848fe7..fbd81898 100644 --- a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp +++ b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusion2DRAMController.cpp | +| GigabyteRGBFusion2DRAMController.cpp | | | | Driver for Gigabyte Aorus RGB Fusion 2 | | DRAM lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 6/7/2020 | \*-----------------------------------------*/ -#include "RGBFusion2DRAMController.h" +#include "GigabyteRGBFusion2DRAMController.h" #include #include diff --git a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.h b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.h similarity index 98% rename from Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.h rename to Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.h index b5aaac91..e00f34c4 100644 --- a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.h +++ b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusion2DRAMController.h | +| GigabyteRGBFusion2DRAMController.h | | | | Definitions and types for Gigabyte Aorus | | RGB Fusion 2 DRAM lighting controller | diff --git a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp similarity index 67% rename from Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp rename to Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp index eb98b895..e347fc43 100644 --- a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "RGBFusion2DRAMController.h" +#include "GigabyteRGBFusion2DRAMController.h" #include "RGBController.h" -#include "RGBController_RGBFusion2DRAM.h" +#include "RGBController_GigabyteRGBFusion2DRAM.h" #include "i2c_smbus.h" #include "pci_ids.h" #include @@ -11,14 +11,14 @@ /******************************************************************************************\ * * -* TestForRGBFusion2DRAMController * +* TestForGigabyteRGBFusion2DRAMController * * * * Tests the given address to see if an RGB 2 Fusion DRAMcontroller exists there. * * First does a quick write to test for a response * * * \******************************************************************************************/ -bool TestForRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned char address) +bool TestForGigabyteRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; @@ -37,20 +37,20 @@ bool TestForRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned char add return(pass); -} /* TestForRGBFusion2DRAMController() */ +} /* TestForGigabyteRGBFusion2DRAMController() */ -/******************************************************************************************\ -* * -* DetectRGBFusion2DRAMControllers * -* * -* Detect RGB Fusion 2 controllers on the enumerated I2C busses at address 0x67. * -* * -* bus - pointer to i2c_smbus_interface where RGB Fusion device is connected * -* dev - I2C address of RGB Fusion device * -* * -\******************************************************************************************/ +/***********************************************************************************************\ +* * +* DetectGigabyteRGBFusion2DRAMControllers * +* * +* Detect Gigabyte RGB Fusion 2 controllers on the enumerated I2C buses at address 0x67. * +* * +* bus - pointer to i2c_smbus_interface where RGB Fusion device is connected * +* dev - I2C address of RGB Fusion device * +* * +\***********************************************************************************************/ -void DetectRGBFusion2DRAMControllers(std::vector& busses, std::vector& rgb_controllers) +void DetectGigabyteRGBFusion2DRAMControllers(std::vector& busses, std::vector& rgb_controllers) { RGBFusion2DRAMController* new_rgb_fusion; RGBController_RGBFusion2DRAM* new_controller; @@ -60,7 +60,7 @@ void DetectRGBFusion2DRAMControllers(std::vector& busses, IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) { // Check for RGB Fusion 2 DRAM controller at 0x67 - if (TestForRGBFusion2DRAMController(busses[bus], 0x67)) + if (TestForGigabyteRGBFusion2DRAMController(busses[bus], 0x67)) { new_rgb_fusion = new RGBFusion2DRAMController(busses[bus], 0x67); new_controller = new RGBController_RGBFusion2DRAM(new_rgb_fusion); @@ -69,7 +69,7 @@ void DetectRGBFusion2DRAMControllers(std::vector& busses, } } -} /* DetectRGBFusion2DRAMControllers() */ +} /* DetectGigabyteRGBFusion2DRAMControllers() */ // This detector is disabled as proper detection isn't implemented -//REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 DRAM", DetectRGBFusion2DRAMControllers); +//REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 DRAM", DetectGigabyteRGBFusion2DRAMControllers); diff --git a/Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.cpp b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp similarity index 96% rename from Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.cpp rename to Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp index 79997486..fa2499de 100644 --- a/Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.cpp +++ b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2DRAM.cpp | +| GigabyteRGBController_RGBFusion2DRAM.cpp | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion 2 DRAM Driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 6/7/2020 | \*-----------------------------------------*/ -#include "RGBController_RGBFusion2DRAM.h" +#include "RGBController_GigabyteRGBFusion2DRAM.h" RGBController_RGBFusion2DRAM::RGBController_RGBFusion2DRAM(RGBFusion2DRAMController* rgb_fusion_ptr) { diff --git a/Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.h b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h similarity index 90% rename from Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.h rename to Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h index 27050513..b723b646 100644 --- a/Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.h +++ b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2DRAM.h | +| RGBController_GigabyteRGBFusion2DRAM.h | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion 2 DRAM Driver | @@ -10,7 +10,7 @@ #pragma once #include "RGBController.h" -#include "RGBFusion2DRAMController.h" +#include "GigabyteRGBFusion2DRAMController.h" class RGBController_RGBFusion2DRAM : public RGBController { diff --git a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp similarity index 97% rename from Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp rename to Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp index bddf6f32..cfecbd2e 100644 --- a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusion2SMBusController.cpp | +| GigabyteRGBFusion2SMBusController.cpp | | | | Driver for Gigabyte Aorus RGB Fusion 2 | | SMBus lighting controller | @@ -8,7 +8,7 @@ | Matt Harper 5/5/2020 | \*-----------------------------------------*/ -#include "RGBFusion2SMBusController.h" +#include "GigabyteRGBFusion2SMBusController.h" #include #include #include diff --git a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.h b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h similarity index 98% rename from Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.h rename to Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h index 8d7bb42f..93005456 100644 --- a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.h +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusion2SMBusController.h | +| GigabyteRGBFusion2SMBusController.h | | | | Definitions and types for Gigabyte Aorus | | RGB Fusion 2 SMBus lighting controller | diff --git a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp similarity index 88% rename from Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp rename to Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp index 0a1309ec..01940df2 100644 --- a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "RGBFusion2SMBusController.h" +#include "GigabyteRGBFusion2SMBusController.h" #include "RGBController.h" -#include "RGBController_RGBFusion2SMBus.h" +#include "RGBController_GigabyteRGBFusion2SMBus.h" #include "i2c_smbus.h" #include "pci_ids.h" #include @@ -37,14 +37,14 @@ const motherboard_info rgb_fusion_2_smbus_motherboards[] = /******************************************************************************************\ * * -* TestForRGBFusion2SMBusController * +* TestForGigabyteRGBFusion2SMBusController * * * * Tests the given address to see if an RGB 2 Fusion controller exists there. First * * does a quick write to test for a response * * * \******************************************************************************************/ -bool TestForRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char address) +bool TestForGigabyteRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; @@ -61,7 +61,7 @@ bool TestForRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char ad /******************************************************************************************\ * * -* DetectRGBFusion2SMBusControllers * +* DetectGigabyteRGBFusion2SMBusControllers * * * * Detect RGB Fusion 2 controllers on the enumerated I2C busses at address 0x68. * * * @@ -70,7 +70,7 @@ bool TestForRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char ad * * \******************************************************************************************/ -void DetectRGBFusion2SMBusControllers(std::vector& busses, std::vector& rgb_controllers) +void DetectGigabyteRGBFusion2SMBusControllers(std::vector& busses, std::vector& rgb_controllers) { RGBFusion2SMBusController* new_rgb_fusion; RGBController_RGBFusion2SMBus* new_controller; @@ -99,7 +99,7 @@ void DetectRGBFusion2SMBusControllers(std::vector& busses, if (device_name.find("dmdc") == std::string::npos) { // Check for RGB Fusion 2 controller at 0x68 - if (TestForRGBFusion2SMBusController(busses[bus], 0x68)) + if (TestForGigabyteRGBFusion2SMBusController(busses[bus], 0x68)) { new_rgb_fusion = new RGBFusion2SMBusController(busses[bus], 0x68); new_controller = new RGBController_RGBFusion2SMBus(new_rgb_fusion); @@ -112,4 +112,4 @@ void DetectRGBFusion2SMBusControllers(std::vector& busses, } /* DetectRGBFusion2SMBusControllers() */ -REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 SMBus", DetectRGBFusion2SMBusControllers); +REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 SMBus", DetectGigabyteRGBFusion2SMBusControllers); diff --git a/Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.cpp b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp similarity index 98% rename from Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.cpp rename to Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp index d14a4d74..b7a3b9f2 100644 --- a/Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2SMBus.cpp | +| RGBController_GigabyteRGBFusion2SMBus.cpp| | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion 2 SMBUS Driver | @@ -7,7 +7,7 @@ | Matt Harper (5/5/2020) | \*-----------------------------------------*/ -#include "RGBController_RGBFusion2SMBus.h" +#include "RGBController_GigabyteRGBFusion2SMBus.h" /* TODO - Validate all of these * CPU diff --git a/Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.h b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h similarity index 90% rename from Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.h rename to Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h index 4111a70c..3392d2f9 100644 --- a/Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.h +++ b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h @@ -1,6 +1,6 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2SMBus.h | +| RGBController_GigabyteRGBFusion2SMBus.h | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion 2 SMBUS Driver | @@ -11,7 +11,7 @@ #pragma once #include "RGBController.h" -#include "RGBFusion2SMBusController.h" +#include "GigabyteRGBFusion2SMBusController.h" class RGBController_RGBFusion2SMBus : public RGBController { diff --git a/Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp similarity index 98% rename from Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp rename to Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp index 2fe63d65..7841eb9f 100644 --- a/Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp +++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusion2USBController.cpp | +| GigabyteRGBFusion2USBController.cpp | | | | Driver for Gigabyte Aorus RGB Fusion 2.0 | | USB lighting controller | @@ -7,7 +7,7 @@ | jackun 1/8/2020 | \*-----------------------------------------*/ -#include "RGBFusion2USBController.h" +#include "GigabyteRGBFusion2USBController.h" #include #include #include diff --git a/Controllers/RGBFusion2USBController/RGBFusion2USBController.h b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h similarity index 99% rename from Controllers/RGBFusion2USBController/RGBFusion2USBController.h rename to Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h index 28780d97..c400ca44 100644 --- a/Controllers/RGBFusion2USBController/RGBFusion2USBController.h +++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusion2USBController.h | +| GigabyteRGBFusion2USBController.h | | | | Definitions and types for Gigabyte Aorus | | RGB Fusion 2.0 USB lighting controller | diff --git a/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBControllerDetect.cpp similarity index 83% rename from Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp rename to Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBControllerDetect.cpp index 0910421e..64a612a3 100644 --- a/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBControllerDetect.cpp @@ -1,6 +1,6 @@ #include "Detector.h" -#include "RGBFusion2USBController.h" -#include "RGBController_RGBFusion2USB.h" +#include "GigabyteRGBFusion2USBController.h" +#include "RGBController_GigabyteRGBFusion2USB.h" #include "dependencies/dmiinfo.h" #define IT8297_VID 0x048D @@ -17,13 +17,13 @@ static const unsigned short RGBFusion2_pids[] = /******************************************************************************************\ * * -* DetectRGBFusion2USBControllers * +* DetectGigabyteRGBFusion2USBControllers * * * -* Detect RGB Fusion 2 devices that use IT8297 RGB controller * +* Detect GigabyteRGB Fusion 2 devices that use IT8297 RGB controller * * * \******************************************************************************************/ -void DetectRGBFusion2USBControllers(std::vector &rgb_controllers) +void DetectGigabyteRGBFusion2USBControllers(std::vector &rgb_controllers) { hid_device_info* info; hid_device* dev; @@ -68,6 +68,6 @@ void DetectRGBFusion2USBControllers(std::vector &rgb_controllers } hid_free_enumeration(info); -} /* DetectRGBFusion2USBControllers() */ +} /* DetectGigabyteRGBFusion2USBControllers() */ -REGISTER_DETECTOR("Gigabyte RGB Fusion 2 USB", DetectRGBFusion2USBControllers); +REGISTER_DETECTOR("Gigabyte RGB Fusion 2 USB", DetectGigabyteRGBFusion2USBControllers); diff --git a/Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.cpp b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp similarity index 99% rename from Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.cpp rename to Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp index 9ccb387d..2112352c 100644 --- a/Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.cpp +++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2USB.cpp | +| RGBController_GigabyteRGBFusion2USB.cpp | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion 2.0 USB Driver | @@ -7,7 +7,7 @@ | jackun 1/8/2020 | \*-----------------------------------------*/ -#include "RGBController_RGBFusion2USB.h" +#include "RGBController_GigabyteRGBFusion2USB.h" #include #include diff --git a/Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.h b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h similarity index 94% rename from Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.h rename to Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h index c2aa6b16..b98f6591 100644 --- a/Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.h +++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2USB.h | +| RGBController_GigabyteRGBFusion2USB.h | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion 2.0 USB Driver | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" -#include "RGBFusion2USBController.h" +#include "GigabyteRGBFusion2USBController.h" #include #include diff --git a/Controllers/RGBFusionController/RGBFusionController.cpp b/Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.cpp similarity index 98% rename from Controllers/RGBFusionController/RGBFusionController.cpp rename to Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.cpp index 9e1d2844..e4c24248 100644 --- a/Controllers/RGBFusionController/RGBFusionController.cpp +++ b/Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusionController.cpp | +| GigabyteRGBFusionController.cpp | | | | Driver for Gigabyte Aorus RGB Fusion | | lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/10/2019 | \*-----------------------------------------*/ -#include "RGBFusionController.h" +#include "GigabyteRGBFusionController.h" #include #include #include diff --git a/Controllers/RGBFusionController/RGBFusionController.h b/Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.h similarity index 98% rename from Controllers/RGBFusionController/RGBFusionController.h rename to Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.h index 675231ff..9effbcbe 100644 --- a/Controllers/RGBFusionController/RGBFusionController.h +++ b/Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusionController.h | +| GigabyteRGBFusionController.h | | | | Definitions and types for Gigabyte Aorus | | RGB Fusion lighting controller | diff --git a/Controllers/RGBFusionController/RGBFusionControllerDetect.cpp b/Controllers/GigabyteRGBFusionController/GigabyteRGBFusionControllerDetect.cpp similarity index 78% rename from Controllers/RGBFusionController/RGBFusionControllerDetect.cpp rename to Controllers/GigabyteRGBFusionController/GigabyteRGBFusionControllerDetect.cpp index 9ec56a16..7c549432 100644 --- a/Controllers/RGBFusionController/RGBFusionControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusionController/GigabyteRGBFusionControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "RGBFusionController.h" +#include "GigabyteRGBFusionController.h" #include "RGBController.h" -#include "RGBController_RGBFusion.h" +#include "RGBController_GigabyteRGBFusion.h" #include "i2c_smbus.h" #include "pci_ids.h" #include @@ -10,14 +10,14 @@ /******************************************************************************************\ * * -* TestForRGBFusionController * +* TestForGigabyteRGBFusionController * * * * Tests the given address to see if an RGB Fusion controller exists there. First * * does a quick write to test for a response * * * \******************************************************************************************/ -bool TestForRGBFusionController(i2c_smbus_interface* bus, unsigned char address) +bool TestForGigabyteRGBFusionController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; @@ -37,11 +37,11 @@ bool TestForRGBFusionController(i2c_smbus_interface* bus, unsigned char address) return(pass); -} /* TestForRGBFusionController() */ +} /* TestForGigabyteRGBFusionController() */ /******************************************************************************************\ * * -* DetectRGBFusionControllers * +* DetectGigabyteRGBFusionControllers * * * * Detect RGB Fusion controllers on the enumerated I2C busses at address 0x28. * * * @@ -50,7 +50,7 @@ bool TestForRGBFusionController(i2c_smbus_interface* bus, unsigned char address) * * \******************************************************************************************/ -void DetectRGBFusionControllers(std::vector& busses, std::vector& rgb_controllers) +void DetectGigabyteRGBFusionControllers(std::vector& busses, std::vector& rgb_controllers) { RGBFusionController* new_rgb_fusion; RGBController_RGBFusion* new_controller; @@ -60,7 +60,7 @@ void DetectRGBFusionControllers(std::vector& busses, std:: IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) { // Check for RGB Fusion controller at 0x28 - if (TestForRGBFusionController(busses[bus], 0x28)) + if (TestForGigabyteRGBFusionController(busses[bus], 0x28)) { new_rgb_fusion = new RGBFusionController(busses[bus], 0x28); new_controller = new RGBController_RGBFusion(new_rgb_fusion); @@ -69,6 +69,6 @@ void DetectRGBFusionControllers(std::vector& busses, std:: } } -} /* DetectRGBFusionControllers() */ +} /* DetectGigabyteRGBFusionControllers() */ -REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion", DetectRGBFusionControllers); +REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion", DetectGigabyteRGBFusionControllers); diff --git a/Controllers/RGBFusionController/RGBController_RGBFusion.cpp b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp similarity index 98% rename from Controllers/RGBFusionController/RGBController_RGBFusion.cpp rename to Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp index 4c612e1a..fee35e72 100644 --- a/Controllers/RGBFusionController/RGBController_RGBFusion.cpp +++ b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion.cpp | +| RGBController_GigabyteRGBFusion.cpp | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion Driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/11/2019 | \*-----------------------------------------*/ -#include "RGBController_RGBFusion.h" +#include "RGBController_GigabyteRGBFusion.h" static const char* rgb_fusion_zone_names[] = { diff --git a/Controllers/RGBFusionController/RGBController_RGBFusion.h b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h similarity index 90% rename from Controllers/RGBFusionController/RGBController_RGBFusion.h rename to Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h index ec5d197e..d562b0f6 100644 --- a/Controllers/RGBFusionController/RGBController_RGBFusion.h +++ b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion.h | +| RGBController_GigabyteRGBFusion.h | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion Driver | @@ -10,7 +10,7 @@ #pragma once #include "RGBController.h" -#include "RGBFusionController.h" +#include "GigabyteRGBFusionController.h" class RGBController_RGBFusion : public RGBController { diff --git a/Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp b/Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.cpp similarity index 93% rename from Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp rename to Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.cpp index 90b20063..e723bfa4 100644 --- a/Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp +++ b/Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusionGPUController.cpp | +| GigabyteRGBFusionGPUController.cpp | | | | Driver for Gigabyte Aorus RGB Fusion GPU | | lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 2/20/2020 | \*-----------------------------------------*/ -#include "RGBFusionGPUController.h" +#include "GigabyteRGBFusionGPUController.h" RGBFusionGPUController::RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev) { diff --git a/Controllers/RGBFusionGPUController/RGBFusionGPUController.h b/Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.h similarity index 96% rename from Controllers/RGBFusionGPUController/RGBFusionGPUController.h rename to Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.h index 863894e0..a3c09e3e 100644 --- a/Controllers/RGBFusionGPUController/RGBFusionGPUController.h +++ b/Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBFusionGPUController.h | +| GigabyteRGBFusionGPUController.h | | | | Definitions and types for Gigabyte Aorus | | RGB Fusion GPU lighting controller | diff --git a/Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp b/Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp similarity index 85% rename from Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp rename to Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp index 50cc6e16..c5169bae 100644 --- a/Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "RGBFusionGPUController.h" +#include "GigabyteRGBFusionGPUController.h" #include "RGBController.h" -#include "RGBController_RGBFusionGPU.h" +#include "RGBController_GigabyteRGBFusionGPU.h" #include "i2c_smbus.h" #include "pci_ids.h" #include @@ -28,14 +28,14 @@ static const gpu_pci_device device_list[] = /******************************************************************************************\ * * -* TestForRGBFusionGPUController * +* TestForGigabyteRGBFusionGPUController * * * * Tests the given address to see if an RGB Fusion controller exists there. First * * does a quick write to test for a response * * * \******************************************************************************************/ -bool TestForRGBFusionGPUController(i2c_smbus_interface* bus, unsigned char address) +bool TestForGigabyteRGBFusionGPUController(i2c_smbus_interface* bus, unsigned char address) { bool pass = false; int res; @@ -77,14 +77,14 @@ bool TestForRGBFusionGPUController(i2c_smbus_interface* bus, unsigned char addre * * * DetectRGBFusionGPUControllers * * * -* Detect RGB Fusion controllers on the enumerated I2C busses at address 0x47. * +* Detect GigabyteRGB Fusion controllers on the enumerated I2C busses at address 0x47.* * * * bus - pointer to i2c_smbus_interface where RGB Fusion device is connected * * dev - I2C address of RGB Fusion device * * * \******************************************************************************************/ -void DetectRGBFusionGPUControllers(std::vector& busses, std::vector& rgb_controllers) +void DetectGigabyteRGBFusionGPUControllers(std::vector& busses, std::vector& rgb_controllers) { RGBFusionGPUController* new_rgb_fusion; RGBController_RGBFusionGPU* new_controller; @@ -99,7 +99,7 @@ void DetectRGBFusionGPUControllers(std::vector& busses, st busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) { // Check for RGB Fusion controller - if (TestForRGBFusionGPUController(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); @@ -110,6 +110,6 @@ void DetectRGBFusionGPUControllers(std::vector& busses, st } } -} /* DetectRGBFusionGPUControllers() */ +} /* DetectGigabyteRGBFusionGPUControllers() */ -REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion GPU", DetectRGBFusionGPUControllers); +REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion GPU", DetectGigabyteRGBFusionGPUControllers); diff --git a/Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.cpp b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp similarity index 98% rename from Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.cpp rename to Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp index 1ede24e9..9f706354 100644 --- a/Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.cpp +++ b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusionGPU.cpp | +| RGBController_GigabyteRGBFusionGPU.cpp | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion GPU Driver | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 2/23/2020 | \*-----------------------------------------*/ -#include "RGBController_RGBFusionGPU.h" +#include "RGBController_GigabyteRGBFusionGPU.h" RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* rgb_fusion_ptr) { diff --git a/Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.h b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h similarity index 90% rename from Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.h rename to Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h index a21e785a..724bcea4 100644 --- a/Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.h +++ b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_RGBFusionGPU.h | +| RGBController_GigabyteRGBFusionGPU.h | | | | Generic RGB Interface for OpenRGB | | Gigabyte RGB Fusion GPU Driver | @@ -10,7 +10,7 @@ #pragma once #include "RGBController.h" -#include "RGBFusionGPUController.h" +#include "GigabyteRGBFusionGPUController.h" class RGBController_RGBFusionGPU : public RGBController { diff --git a/Controllers/HuePlusController/HuePlusController.cpp b/Controllers/NZXTHuePlusController/NZXTHuePlusController.cpp similarity index 99% rename from Controllers/HuePlusController/HuePlusController.cpp rename to Controllers/NZXTHuePlusController/NZXTHuePlusController.cpp index 326a7178..cab924ca 100644 --- a/Controllers/HuePlusController/HuePlusController.cpp +++ b/Controllers/NZXTHuePlusController/NZXTHuePlusController.cpp @@ -4,7 +4,7 @@ | Adam Honse (calcprogrammer1@gmail.com), 12/11/2016 | \*---------------------------------------------------------*/ -#include "HuePlusController.h" +#include "NZXTHuePlusController.h" #include #include diff --git a/Controllers/HuePlusController/HuePlusController.h b/Controllers/NZXTHuePlusController/NZXTHuePlusController.h similarity index 100% rename from Controllers/HuePlusController/HuePlusController.h rename to Controllers/NZXTHuePlusController/NZXTHuePlusController.h diff --git a/Controllers/HuePlusController/HuePlusControllerDetect.cpp b/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp similarity index 78% rename from Controllers/HuePlusController/HuePlusControllerDetect.cpp rename to Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp index b8f6f984..31aad00c 100644 --- a/Controllers/HuePlusController/HuePlusControllerDetect.cpp +++ b/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "HuePlusController.h" +#include "NZXTHuePlusController.h" #include "RGBController.h" -#include "RGBController_HuePlus.h" +#include "RGBController_NZXTHuePlus.h" #include "find_usb_serial_port.h" #include @@ -10,13 +10,13 @@ /******************************************************************************************\ * * -* DetectHuePlusControllers * +* DetectNZXTHuePlusControllers * * * -* Detect devices supported by the HuePlus driver * +* Detect devices supported by the NZXTHuePlus driver * * * \******************************************************************************************/ -void DetectHuePlusControllers(std::vector &rgb_controllers) +void DetectNZXTHuePlusControllers(std::vector &rgb_controllers) { size_t i; HuePlusController* new_hueplus; @@ -37,4 +37,4 @@ void DetectHuePlusControllers(std::vector &rgb_controllers) } } /* DetectHuePlusControllers() */ -REGISTER_DETECTOR("NZXT Hue+", DetectHuePlusControllers); +REGISTER_DETECTOR("NZXT Hue+", DetectNZXTHuePlusControllers); diff --git a/Controllers/HuePlusController/RGBController_HuePlus.cpp b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp similarity index 99% rename from Controllers/HuePlusController/RGBController_HuePlus.cpp rename to Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp index 4260e682..d20dfa12 100644 --- a/Controllers/HuePlusController/RGBController_HuePlus.cpp +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp @@ -1,12 +1,12 @@ /*-----------------------------------------*\ -| RGBController_HuePlus.cpp | +| RGBController_NZXTHuePlus.cpp | | | | Generic RGB Interface for NZXT Hue+ | | | | Adam Honse (CalcProgrammer1) 6/20/2019 | \*-----------------------------------------*/ -#include "RGBController_HuePlus.h" +#include "RGBController_NZXTHuePlus.h" RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr) diff --git a/Controllers/HuePlusController/RGBController_HuePlus.h b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h similarity index 91% rename from Controllers/HuePlusController/RGBController_HuePlus.h rename to Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h index b9594d00..7b99f064 100644 --- a/Controllers/HuePlusController/RGBController_HuePlus.h +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_HuePlus.h | +| RGBController_NZXTHuePlus.h | | | | Generic RGB Interface for NZXT Hue+ | | | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" #include "serial_port.h" -#include "HuePlusController.h" +#include "NZXTHuePlusController.h" class RGBController_HuePlus : public RGBController { diff --git a/Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.cpp b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp similarity index 98% rename from Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.cpp rename to Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp index e8fca04b..878980f8 100644 --- a/Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_PoseidonZRGB.cpp | +| RGBController_ThermaltakePoseidonZRGB.cpp| | | | Generic RGB Interface for Thermaltake | | Poseidon Z RGB Keyboard | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/25/2019 | \*-----------------------------------------*/ -#include "RGBController_PoseidonZRGB.h" +#include "RGBController_ThermaltakePoseidonZRGB.h" //0xFFFFFFFF indicates an unused entry in matrix #define NA 0xFFFFFFFF diff --git a/Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.h b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.h similarity index 90% rename from Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.h rename to Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.h index fbab166f..e4a4bfc6 100644 --- a/Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.h +++ b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_PoseidonZRGB.h | +| RGBController_ThermaltakePoseidonZRGB.h | | | | Generic RGB Interface for Thermaltake | | Poseidon Z RGB Keyboard | @@ -9,7 +9,7 @@ #pragma once #include "RGBController.h" -#include "PoseidonZRGBController.h" +#include "ThermaltakePoseidonZRGBController.h" class RGBController_PoseidonZRGB : public RGBController { diff --git a/Controllers/PoseidonZRGBController/PoseidonZRGBController.cpp b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp similarity index 98% rename from Controllers/PoseidonZRGBController/PoseidonZRGBController.cpp rename to Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp index 4d48e8f6..891965d3 100644 --- a/Controllers/PoseidonZRGBController/PoseidonZRGBController.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| PoseidonZRGBController.cpp | +| ThermaltakePoseidonZRGBController.cpp | | | | Driver for Thermaltake Poseidon Z RGB | | Keyboard lighting controller | @@ -7,7 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/25/2019 | \*-----------------------------------------*/ -#include "PoseidonZRGBController.h" +#include "ThermaltakePoseidonZRGBController.h" #include diff --git a/Controllers/PoseidonZRGBController/PoseidonZRGBController.h b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.h similarity index 98% rename from Controllers/PoseidonZRGBController/PoseidonZRGBController.h rename to Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.h index 9fae5ec1..3b36b697 100644 --- a/Controllers/PoseidonZRGBController/PoseidonZRGBController.h +++ b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| PoseidonZRGBController.h | +| ThermaltakePoseidonZRGBController.h | | | | Definitions and types for Thermaltake | | Poseidon Z RGB Keyboard lighting | diff --git a/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBControllerDetect.cpp similarity index 95% rename from Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp rename to Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBControllerDetect.cpp index 78f2422a..0cc0f74b 100644 --- a/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "PoseidonZRGBController.h" +#include "ThermaltakePoseidonZRGBController.h" #include "RGBController.h" -#include "RGBController_PoseidonZRGB.h" +#include "RGBController_ThermaltakePoseidonZRGB.h" #include #include diff --git a/OpenRGB.pro b/OpenRGB.pro index f983b32c..0068e722 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -50,12 +50,12 @@ INCLUDEPATH += pci_ids/ \ serial_port/ \ super_io/ \ - Controllers/AorusCPUCoolerController/ \ Controllers/AMDWraithPrismController/ \ - Controllers/AuraUSBController/ \ - Controllers/AuraCoreController/ \ - Controllers/AuraGPUController/ \ - Controllers/AuraSMBusController/ \ + Controllers/ASRockPolyChromeSMBusController/ \ + Controllers/AsusAuraCoreController/ \ + Controllers/AsusAuraGPUController/ \ + Controllers/AsusAuraSMBusController/ \ + Controllers/AsusAuraUSBController/ \ Controllers/CoolerMasterController/ \ Controllers/CorsairDominatorPlatinumController/ \ Controllers/CorsairHydroController/ \ @@ -70,9 +70,14 @@ INCLUDEPATH += Controllers/EKController/ \ Controllers/EspurnaController/ \ Controllers/EVGAGPUController/ \ + Controllers/GigabyteAorusCPUCoolerController/ \ + Controllers/GigabyteRGBFusion2DRAMController/ \ + Controllers/GigabyteRGBFusion2SMBusController/ \ + Controllers/GigabyteRGBFusion2USBController/ \ + Controllers/GigabyteRGBFusionController/ \ + Controllers/GigabyteRGBFusionGPUController/ \ Controllers/GalaxGPUController/ \ Controllers/HoltekController/ \ - Controllers/HuePlusController/ \ Controllers/HyperXDRAMController/ \ Controllers/HyperXKeyboardController/ \ Controllers/HyperXMouseController/ \ @@ -84,23 +89,18 @@ INCLUDEPATH += Controllers/MSIMysticLightController/ \ Controllers/MSIRGBController/ \ Controllers/NZXTHue2Controller/ \ + Controllers/NZXTHuePlusController/ \ Controllers/NZXTKrakenController/ \ Controllers/OpenRazerController/ \ Controllers/PatriotViperController/ \ Controllers/PhilipsWizController/ \ - Controllers/PolychromeController/ \ - Controllers/PoseidonZRGBController/ \ Controllers/RedragonController/ \ - Controllers/RGBFusionController/ \ - Controllers/RGBFusion2DRAMController/ \ - Controllers/RGBFusion2SMBusController/ \ - Controllers/RGBFusion2USBController/ \ - Controllers/RGBFusionGPUController/ \ Controllers/SapphireGPUController/ \ Controllers/SinowealthController/ \ Controllers/SonyDS4Controller/ \ Controllers/SteelSeriesController/ \ Controllers/TecknetController/ \ + Controllers/ThermaltakePoseidonZRGBController/ \ Controllers/ThermaltakeRiingController/ \ RGBController/ \ qt/ @@ -136,20 +136,20 @@ HEADERS += super_io/super_io.h \ Controllers/AMDWraithPrismController/AMDWraithPrismController.h \ Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h \ - Controllers/AorusCPUCoolerController/ATC800Controller.h \ - Controllers/AorusCPUCoolerController/RGBController_AorusATC800.h \ - Controllers/AuraUSBController/AuraUSBController.h \ - Controllers/AuraUSBController/AuraAddressableController.h \ - Controllers/AuraUSBController/AuraMainboardController.h \ - Controllers/AuraUSBController/AuraMouseController.h \ - Controllers/AuraUSBController/RGBController_AuraMouse.h \ - Controllers/AuraUSBController/RGBController_AuraUSB.h \ - Controllers/AuraCoreController/AuraCoreController.h \ - Controllers/AuraCoreController/RGBController_AuraCore.h \ - Controllers/AuraGPUController/AuraGPUController.h \ - Controllers/AuraGPUController/RGBController_AuraGPU.h \ - Controllers/AuraSMBusController/AuraSMBusController.h \ - Controllers/AuraSMBusController/RGBController_AuraSMBus.h \ + Controllers/ASRockPolyChromeSMBusController/ASRockPolyChromeSMBusController.h \ + Controllers/ASRockPolyChromeSMBusController/RGBController_ASRockPolyChromeSMBus.h \ + Controllers/AsusAuraCoreController/AsusAuraCoreController.h \ + Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h \ + Controllers/AsusAuraGPUController/AsusAuraGPUController.h \ + Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h \ + Controllers/AsusAuraSMBusController/AsusAuraSMBusController.h \ + Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.h \ + Controllers/AsusAuraUSBController/AsusAuraUSBController.h \ + Controllers/AsusAuraUSBController/AsusAuraAddressableController.h \ + Controllers/AsusAuraUSBController/AsusAuraMainboardController.h \ + Controllers/AsusAuraUSBController/AsusAuraMouseController.h \ + Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h \ + Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h \ Controllers/CoolerMasterController/CMARGBcontroller.h \ Controllers/CoolerMasterController/CMMP750Controller.h \ Controllers/CoolerMasterController/RGBController_CMARGBController.h \ @@ -179,12 +179,22 @@ HEADERS += Controllers/EVGAGPUController/EVGAGPUv2Controller.h \ Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h \ Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h \ + Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.h \ + Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h \ + Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.h \ + Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h \ + Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h \ + Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h \ + Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h \ + Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h \ + Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.h \ + Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h \ + Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.h \ + Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h \ Controllers/GalaxGPUController/GalaxGPUController.h \ Controllers/GalaxGPUController/RGBController_GalaxGPU.h \ Controllers/HoltekController/HoltekA070Controller.h \ Controllers/HoltekController/RGBController_HoltekA070.h \ - Controllers/HuePlusController/HuePlusController.h \ - Controllers/HuePlusController/RGBController_HuePlus.h \ Controllers/HyperXDRAMController/HyperXDRAMController.h \ Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h \ Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.h \ @@ -223,6 +233,8 @@ HEADERS += Controllers/MSIRGBController/RGBController_MSIRGB.h \ Controllers/NZXTHue2Controller/NZXTHue2Controller.h \ Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h \ + Controllers/NZXTHuePlusController/NZXTHuePlusController.h \ + Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h \ Controllers/NZXTKrakenController/NZXTKrakenController.h \ Controllers/NZXTKrakenController/RGBController_NZXTKraken.h \ Controllers/OpenRazerController/OpenRazerDevices.h \ @@ -230,24 +242,10 @@ HEADERS += Controllers/PatriotViperController/RGBController_PatriotViper.h \ Controllers/PhilipsWizController/PhilipsWizController.h \ Controllers/PhilipsWizController/RGBController_PhilipsWiz.h \ - Controllers/PolychromeController/PolychromeController.h \ - Controllers/PolychromeController/RGBController_Polychrome.h \ - Controllers/PoseidonZRGBController/PoseidonZRGBController.h \ - Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.h \ Controllers/RedragonController/RedragonK556Controller.h \ Controllers/RedragonController/RedragonM711Controller.h \ Controllers/RedragonController/RGBController_RedragonK556.h \ Controllers/RedragonController/RGBController_RedragonM711.h \ - Controllers/RGBFusionController/RGBFusionController.h \ - Controllers/RGBFusionController/RGBController_RGBFusion.h \ - Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.h \ - Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.h \ - Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.h \ - Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.h \ - Controllers/RGBFusion2USBController/RGBFusion2USBController.h \ - Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.h \ - Controllers/RGBFusionGPUController/RGBFusionGPUController.h \ - Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.h \ Controllers/SapphireGPUController/SapphireGPUController.h \ Controllers/SapphireGPUController/RGBController_SapphireGPU.h \ Controllers/SinowealthController/SinowealthController.h \ @@ -264,6 +262,8 @@ HEADERS += Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h \ Controllers/TecknetController/TecknetController.h \ Controllers/TecknetController/RGBController_Tecknet.h \ + Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.h \ + Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.h \ Controllers/ThermaltakeRiingController/ThermaltakeRiingController.h \ Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h \ RGBController/RGBController.h \ @@ -302,25 +302,25 @@ SOURCES += Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp \ Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp \ Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp \ - Controllers/AorusCPUCoolerController/ATC800Controller.cpp \ - Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp \ - Controllers/AorusCPUCoolerController/RGBController_AorusATC800.cpp \ - Controllers/AuraUSBController/AuraUSBController.cpp \ - Controllers/AuraUSBController/AuraAddressableController.cpp \ - Controllers/AuraUSBController/AuraMainboardController.cpp \ - Controllers/AuraUSBController/AuraMouseController.cpp \ - Controllers/AuraUSBController/AuraUSBControllerDetect.cpp \ - Controllers/AuraUSBController/RGBController_AuraMouse.cpp \ - Controllers/AuraUSBController/RGBController_AuraUSB.cpp \ - Controllers/AuraCoreController/AuraCoreController.cpp \ - Controllers/AuraCoreController/AuraCoreControllerDetect.cpp \ - Controllers/AuraCoreController/RGBController_AuraCore.cpp \ - Controllers/AuraGPUController/AuraGPUController.cpp \ - Controllers/AuraGPUController/AuraGPUControllerDetect.cpp \ - Controllers/AuraGPUController/RGBController_AuraGPU.cpp \ - Controllers/AuraSMBusController/AuraSMBusController.cpp \ - Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp \ - Controllers/AuraSMBusController/RGBController_AuraSMBus.cpp \ + Controllers/ASRockPolyChromeSMBusController/ASRockPolyChromeSMBusController.cpp \ + Controllers/ASRockPolyChromeSMBusController/ASRockPolyChromeSMBusControllerDetect.cpp \ + Controllers/ASRockPolyChromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp \ + Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp \ + Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp \ + Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp \ + Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp \ + Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp \ + Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp \ + Controllers/AsusAuraSMBusController/AsusAuraSMBusController.cpp \ + Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp \ + Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp \ + Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp \ + Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp \ + Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp \ + Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp \ + Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp \ + Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp \ + Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp \ Controllers/CoolerMasterController/CMARGBcontroller.cpp \ Controllers/CoolerMasterController/CMMP750Controller.cpp \ Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp \ @@ -364,15 +364,30 @@ SOURCES += Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp \ Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp \ Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp \ + Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp \ + Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp \ + Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp \ + Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp \ + Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp \ + Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp \ + Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp \ + Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp \ + Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp \ + Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp \ + Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBControllerDetect.cpp \ + Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp \ + Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.cpp \ + Controllers/GigabyteRGBFusionController/GigabyteRGBFusionControllerDetect.cpp \ + Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp \ + Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.cpp \ + Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp \ + Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp \ Controllers/GalaxGPUController/GalaxGPUController.cpp \ Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp \ Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp \ Controllers/HoltekController/HoltekA070Controller.cpp \ Controllers/HoltekController/HoltekControllerDetect.cpp \ Controllers/HoltekController/RGBController_HoltekA070.cpp \ - Controllers/HuePlusController/HuePlusController.cpp \ - Controllers/HuePlusController/HuePlusControllerDetect.cpp \ - Controllers/HuePlusController/RGBController_HuePlus.cpp \ Controllers/HyperXDRAMController/HyperXDRAMController.cpp \ Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp \ Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp \ @@ -422,6 +437,9 @@ SOURCES += Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp \ Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp \ Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp \ + Controllers/NZXTHuePlusController/NZXTHuePlusController.cpp \ + Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp \ + Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp \ Controllers/NZXTKrakenController/NZXTKrakenController.cpp \ Controllers/NZXTKrakenController/NZXTKrakenControllerDetect.cpp \ Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp \ @@ -431,32 +449,11 @@ SOURCES += Controllers/PhilipsWizController/PhilipsWizController.cpp \ Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp \ Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp \ - Controllers/PolychromeController/PolychromeController.cpp \ - Controllers/PolychromeController/PolychromeControllerDetect.cpp \ - Controllers/PolychromeController/RGBController_Polychrome.cpp \ - Controllers/PoseidonZRGBController/PoseidonZRGBController.cpp \ - Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp \ - Controllers/PoseidonZRGBController/RGBController_PoseidonZRGB.cpp \ Controllers/RedragonController/RedragonK556Controller.cpp \ Controllers/RedragonController/RedragonM711Controller.cpp \ Controllers/RedragonController/RedragonControllerDetect.cpp \ Controllers/RedragonController/RGBController_RedragonK556.cpp \ Controllers/RedragonController/RGBController_RedragonM711.cpp \ - Controllers/RGBFusionController/RGBFusionController.cpp \ - Controllers/RGBFusionController/RGBFusionControllerDetect.cpp \ - Controllers/RGBFusionController/RGBController_RGBFusion.cpp \ - Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp \ - Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp \ - Controllers/RGBFusion2DRAMController/RGBController_RGBFusion2DRAM.cpp \ - Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp \ - Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp \ - Controllers/RGBFusion2SMBusController/RGBController_RGBFusion2SMBus.cpp \ - Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp \ - Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp \ - Controllers/RGBFusion2USBController/RGBController_RGBFusion2USB.cpp \ - Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp \ - Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp \ - Controllers/RGBFusionGPUController/RGBController_RGBFusionGPU.cpp \ Controllers/SapphireGPUController/SapphireGPUController.cpp \ Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp \ Controllers/SapphireGPUController/RGBController_SapphireGPU.cpp \ @@ -477,6 +474,9 @@ SOURCES += Controllers/TecknetController/TecknetController.cpp \ Controllers/TecknetController/TecknetControllerDetect.cpp \ Controllers/TecknetController/RGBController_Tecknet.cpp \ + Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp \ + Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBControllerDetect.cpp \ + Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp \ Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp \ Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp \ Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp \