diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp index ae136da8..1b408936 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp @@ -51,4 +51,4 @@ void DetectAMDWraithPrismControllers(std::vector& rgb_controller } } -REGISTER_DETECTOR(DetectAMDWraithPrismControllers); \ No newline at end of file +REGISTER_DETECTOR("AMD Wraith Prism", DetectAMDWraithPrismControllers); diff --git a/Controllers/AuraCoreController/AuraCoreControllerDetect.cpp b/Controllers/AuraCoreController/AuraCoreControllerDetect.cpp index 4f0fc84a..dda7ca86 100644 --- a/Controllers/AuraCoreController/AuraCoreControllerDetect.cpp +++ b/Controllers/AuraCoreController/AuraCoreControllerDetect.cpp @@ -45,4 +45,4 @@ void DetectAuraCoreControllers(std::vector& rgb_controllers) } } -REGISTER_DETECTOR(DetectAuraCoreControllers); \ No newline at end of file +REGISTER_DETECTOR("ASUS Aura Core", DetectAuraCoreControllers); diff --git a/Controllers/AuraGPUController/AuraGPUControllerDetect.cpp b/Controllers/AuraGPUController/AuraGPUControllerDetect.cpp index 724a760d..3d98a86c 100644 --- a/Controllers/AuraGPUController/AuraGPUControllerDetect.cpp +++ b/Controllers/AuraGPUController/AuraGPUControllerDetect.cpp @@ -85,4 +85,4 @@ void DetectAuraGPUControllers(std::vector &busses, std::ve } } /* DetectAuraGPUControllers() */ -REGISTER_I2C_DETECTOR(DetectAuraGPUControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("ASUS Aura GPU", DetectAuraGPUControllers); diff --git a/Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp b/Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp index 25b6c62c..a9e2f920 100644 --- a/Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp +++ b/Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp @@ -190,4 +190,4 @@ void DetectAuraSMBusControllers(std::vector &busses, std:: } /* DetectAuraSMBusControllers() */ -REGISTER_I2C_DETECTOR(DetectAuraSMBusControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("ASUS Aura SMBus", DetectAuraSMBusControllers); diff --git a/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp b/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp index 5c1a82a3..ba57296e 100644 --- a/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp +++ b/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp @@ -77,4 +77,4 @@ void DetectAuraUSBControllers(std::vector& rgb_controllers) } } /* DetectAuraUSBControllers() */ -REGISTER_DETECTOR(DetectAuraUSBControllers); \ No newline at end of file +REGISTER_DETECTOR("ASUS Aura USB", DetectAuraUSBControllers); diff --git a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp index c8642dd1..6b18d7ed 100644 --- a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp +++ b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp @@ -66,4 +66,4 @@ void DetectCoolerMasterControllers(std::vector& rgb_controllers) hid_free_enumeration(info); } /* DetectCoolerMasterControllers() */ -REGISTER_DETECTOR(DetectCoolerMasterControllers); \ No newline at end of file +REGISTER_DETECTOR("Cooler Master", DetectCoolerMasterControllers); diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp index 8cf43316..90ab528c 100644 --- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp @@ -79,4 +79,4 @@ void DetectCorsairLightingNodeControllers(std::vector &rgb_contr } } /* DetectCorsairLightingNodeControllers() */ -REGISTER_DETECTOR(DetectCorsairLightingNodeControllers); \ No newline at end of file +REGISTER_DETECTOR("Corsair Lighting Node", DetectCorsairLightingNodeControllers); diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp index f01f5d18..6f1b0e29 100644 --- a/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp @@ -160,4 +160,4 @@ void DetectCorsairPeripheralControllers(std::vector& rgb_control } } /* DetectCorsairPeripheralControllers() */ -REGISTER_DETECTOR(DetectCorsairPeripheralControllers); \ No newline at end of file +REGISTER_DETECTOR("Corsair Peripheral", DetectCorsairPeripheralControllers); diff --git a/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp b/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp index ccc93ce2..5a2a1e61 100644 --- a/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp +++ b/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp @@ -125,4 +125,4 @@ void DetectCorsairVengeanceControllers(std::vector &busses } /* DetectCorsairVengeanceControllers() */ -REGISTER_I2C_DETECTOR(DetectCorsairVengeanceControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Corsair Vengeance", DetectCorsairVengeanceControllers); diff --git a/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp b/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp index 8d449fdd..c5153271 100644 --- a/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp +++ b/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp @@ -133,4 +133,4 @@ void DetectCorsairVengeanceProControllers(std::vector &bus } /* DetectCorsairVengeanceProControllers() */ -REGISTER_I2C_DETECTOR(DetectCorsairVengeanceProControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Corsair Vengeance Pro", DetectCorsairVengeanceProControllers); diff --git a/Controllers/CrucialController/CrucialControllerDetect.cpp b/Controllers/CrucialController/CrucialControllerDetect.cpp index ebca350b..7c77b13d 100644 --- a/Controllers/CrucialController/CrucialControllerDetect.cpp +++ b/Controllers/CrucialController/CrucialControllerDetect.cpp @@ -88,4 +88,4 @@ void DetectCrucialControllers(std::vector &busses, std::ve } /* DetectCrucialControllers() */ -REGISTER_I2C_DETECTOR(DetectCrucialControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Crucial", DetectCrucialControllers); diff --git a/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp b/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp index 418d6098..b0a6b0bd 100644 --- a/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp +++ b/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp @@ -81,4 +81,4 @@ void DetectDuckyKeyboardControllers(std::vector& rgb_controllers } } /* DetectDuckyKeyboardControllers() */ -REGISTER_DETECTOR(DetectDuckyKeyboardControllers); \ No newline at end of file +REGISTER_DETECTOR("Ducky Keyboard", DetectDuckyKeyboardControllers); diff --git a/Controllers/EKController/EKControllerDetect.cpp b/Controllers/EKController/EKControllerDetect.cpp index d5903a9f..b5725b73 100644 --- a/Controllers/EKController/EKControllerDetect.cpp +++ b/Controllers/EKController/EKControllerDetect.cpp @@ -64,4 +64,4 @@ void DetectEKControllers(std::vector& rgb_controllers) hid_free_enumeration(info); } /* DetectEKControllers() */ -REGISTER_DETECTOR(DetectEKControllers); +REGISTER_DETECTOR("EK", DetectEKControllers); diff --git a/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp b/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp index 43b1edbc..a82bdb5e 100644 --- a/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp +++ b/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp @@ -68,4 +68,4 @@ void DetectGalaxGPUControllers(std::vector &busses, std::v } /* DetectGalaxGPUControllers() */ -REGISTER_I2C_DETECTOR(DetectGalaxGPUControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Galax GPU", DetectGalaxGPUControllers); diff --git a/Controllers/GloriousModelOController/GloriousModelOControllerDetect.cpp b/Controllers/GloriousModelOController/GloriousModelOControllerDetect.cpp index f5c7f4d6..3fb5932f 100644 --- a/Controllers/GloriousModelOController/GloriousModelOControllerDetect.cpp +++ b/Controllers/GloriousModelOController/GloriousModelOControllerDetect.cpp @@ -60,4 +60,4 @@ void DetectGloriousModelOControllers(std::vector& rgb_controller } } /* DetectGloriousModelOControllers() */ -REGISTER_DETECTOR(DetectGloriousModelOControllers); \ No newline at end of file +REGISTER_DETECTOR("Glorious Model O", DetectGloriousModelOControllers); diff --git a/Controllers/HoltekController/HoltekControllerDetect.cpp b/Controllers/HoltekController/HoltekControllerDetect.cpp index 4be9e7c4..b6a289fa 100644 --- a/Controllers/HoltekController/HoltekControllerDetect.cpp +++ b/Controllers/HoltekController/HoltekControllerDetect.cpp @@ -86,4 +86,4 @@ void DetectHoltekControllers(std::vector& rgb_controllers) } } /* DetectHoltekControllers() */ -REGISTER_DETECTOR(DetectHoltekControllers); \ No newline at end of file +REGISTER_DETECTOR("Holtek", DetectHoltekControllers); diff --git a/Controllers/HuePlusController/HuePlusControllerDetect.cpp b/Controllers/HuePlusController/HuePlusControllerDetect.cpp index cc16323d..b8f6f984 100644 --- a/Controllers/HuePlusController/HuePlusControllerDetect.cpp +++ b/Controllers/HuePlusController/HuePlusControllerDetect.cpp @@ -37,4 +37,4 @@ void DetectHuePlusControllers(std::vector &rgb_controllers) } } /* DetectHuePlusControllers() */ -REGISTER_DETECTOR(DetectHuePlusControllers); \ No newline at end of file +REGISTER_DETECTOR("NZXT Hue+", DetectHuePlusControllers); diff --git a/Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp b/Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp index b1f6d627..32563e58 100644 --- a/Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp +++ b/Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp @@ -95,4 +95,4 @@ void DetectHyperXDRAMControllers(std::vector &busses, std: } /* DetectHyperXDRAMControllers() */ -REGISTER_I2C_DETECTOR(DetectHyperXDRAMControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("HyperX DRAM", DetectHyperXDRAMControllers); diff --git a/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp b/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp index 03780e11..6fd78b2b 100644 --- a/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp +++ b/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp @@ -107,4 +107,4 @@ void DetectHyperXKeyboardControllers(std::vector& rgb_controller } } /* DetectHyperXKeyboardControllers() */ -REGISTER_DETECTOR(DetectHyperXKeyboardControllers); \ No newline at end of file +REGISTER_DETECTOR("HyperX Keyboard", DetectHyperXKeyboardControllers); diff --git a/Controllers/HyperXMouseController/HyperXMouseControllerDetect.cpp b/Controllers/HyperXMouseController/HyperXMouseControllerDetect.cpp index 90c7a09a..24385bc4 100644 --- a/Controllers/HyperXMouseController/HyperXMouseControllerDetect.cpp +++ b/Controllers/HyperXMouseController/HyperXMouseControllerDetect.cpp @@ -81,4 +81,4 @@ void DetectHyperXMouseControllers(std::vector& rgb_controllers) } } /* DetectHyperXMouseControllers() */ -REGISTER_DETECTOR(DetectHyperXMouseControllers); +REGISTER_DETECTOR("HyperX Mouse", DetectHyperXMouseControllers); diff --git a/Controllers/LEDStripController/LEDStripControllerDetect.cpp b/Controllers/LEDStripController/LEDStripControllerDetect.cpp index b76c438b..3276bc92 100644 --- a/Controllers/LEDStripController/LEDStripControllerDetect.cpp +++ b/Controllers/LEDStripController/LEDStripControllerDetect.cpp @@ -87,4 +87,4 @@ void DetectLEDStripControllers(std::vector &rgb_controllers) } /* DetectLEDStripControllers() */ -REGISTER_DETECTOR(DetectLEDStripControllers); \ No newline at end of file +REGISTER_DETECTOR("LED Strip", DetectLEDStripControllers); diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp index 0af7cc31..990edf85 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/Controllers/LogitechController/LogitechControllerDetect.cpp @@ -247,4 +247,4 @@ void DetectLogitechControllers(std::vector& rgb_controllers) } } /* DetectLogitechControllers() */ -REGISTER_DETECTOR(DetectLogitechControllers); \ No newline at end of file +REGISTER_DETECTOR("Logitech", DetectLogitechControllers); diff --git a/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp b/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp index ac668a84..9c05ac8a 100644 --- a/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp +++ b/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp @@ -36,4 +36,4 @@ void DetectMSI3ZoneControllers(std::vector& rgb_controllers) } } /* DetectMSI3ZoneControllers() */ -REGISTER_DETECTOR(DetectMSI3ZoneControllers); +REGISTER_DETECTOR("MSI 3-Zone Laptop", DetectMSI3ZoneControllers); diff --git a/Controllers/MSIGPUController/MSIGPUControllerDetect.cpp b/Controllers/MSIGPUController/MSIGPUControllerDetect.cpp index b19d782a..ec5fe60e 100644 --- a/Controllers/MSIGPUController/MSIGPUControllerDetect.cpp +++ b/Controllers/MSIGPUController/MSIGPUControllerDetect.cpp @@ -113,4 +113,4 @@ void DetectMSIGPUControllers(std::vector &busses, std::vec } } /* DetectMSIGPUControllers() */ -REGISTER_I2C_DETECTOR(DetectMSIGPUControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("MSI GPU", DetectMSIGPUControllers); diff --git a/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp b/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp index e1ab138d..c659d6fc 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp @@ -103,4 +103,4 @@ void DetectMSIMysticLightControllers(std::vector &rgb_controller // The MSI Mystic Light controller is disabled due to bricking risk // Uncomment this line to enable. Do so at your own risk. -//REGISTER_DETECTOR(DetectMSIMysticLightControllers); +//REGISTER_DETECTOR("MSI Mystic Light", DetectMSIMysticLightControllers); diff --git a/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp b/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp index 89fce7b6..d886d0cf 100644 --- a/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp +++ b/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp @@ -40,4 +40,4 @@ void DetectMSIRGBControllers(std::vector &rgb_controllers) } } /* DetectMSIRGBControllers() */ -REGISTER_DETECTOR(DetectMSIRGBControllers); \ No newline at end of file +REGISTER_DETECTOR("MSI-RGB", DetectMSIRGBControllers); diff --git a/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp b/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp index c09c322a..958728f0 100644 --- a/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp +++ b/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp @@ -78,4 +78,4 @@ void DetectNZXTHue2Controllers(std::vector &rgb_controllers) } } /* DetectNZXTHue2Controllers() */ -REGISTER_DETECTOR(DetectNZXTHue2Controllers); \ No newline at end of file +REGISTER_DETECTOR("NZXT Hue 2", DetectNZXTHue2Controllers); diff --git a/Controllers/NZXTKrakenController/NZXTKrakenControllerDetect.cpp b/Controllers/NZXTKrakenController/NZXTKrakenControllerDetect.cpp index 1ab80f81..13105e1a 100644 --- a/Controllers/NZXTKrakenController/NZXTKrakenControllerDetect.cpp +++ b/Controllers/NZXTKrakenController/NZXTKrakenControllerDetect.cpp @@ -51,4 +51,4 @@ void DetectNZXTKrakenControllers(std::vector &rgb_controllers) } } /* DetectNZXTKrakenControllers() */ -REGISTER_DETECTOR(DetectNZXTKrakenControllers); +REGISTER_DETECTOR("NZXT Kraken", DetectNZXTKrakenControllers); diff --git a/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp b/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp index 57c398c2..92a65ba3 100644 --- a/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp +++ b/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp @@ -72,4 +72,4 @@ void DetectPatriotViperControllers(std::vector &busses, st } /* DetectPatriotViperControllers() */ -REGISTER_I2C_DETECTOR(DetectPatriotViperControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Patriot Viper", DetectPatriotViperControllers); diff --git a/Controllers/PolychromeController/PolychromeControllerDetect.cpp b/Controllers/PolychromeController/PolychromeControllerDetect.cpp index ed1ef754..73bc32ad 100644 --- a/Controllers/PolychromeController/PolychromeControllerDetect.cpp +++ b/Controllers/PolychromeController/PolychromeControllerDetect.cpp @@ -69,4 +69,4 @@ void DetectPolychromeControllers(std::vector& busses, std: } /* DetectPolychromeControllers() */ -REGISTER_I2C_DETECTOR(DetectPolychromeControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("ASRock Polychrome", DetectPolychromeControllers); diff --git a/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp b/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp index f6970e90..f70b267b 100644 --- a/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp +++ b/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp @@ -53,4 +53,4 @@ void DetectPoseidonZRGBControllers(std::vector& rgb_controllers) } /* DetectPoseidonZRGBControllers() */ -REGISTER_DETECTOR(DetectPoseidonZRGBControllers); +REGISTER_DETECTOR("Thermaltake Poseidon Z RGB", DetectPoseidonZRGBControllers); diff --git a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp b/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp index a046c9c0..bab9f861 100644 --- a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp +++ b/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMControllerDetect.cpp @@ -68,4 +68,4 @@ void DetectRGBFusion2DRAMControllers(std::vector& busses, } /* DetectRGBFusion2DRAMControllers() */ // This detector is disabled as proper detection isn't implemented -//REGISTER_I2C_DETECTOR(DetectRGBFusion2DRAMControllers); \ No newline at end of file +//REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 DRAM", DetectRGBFusion2DRAMControllers); diff --git a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp b/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp index b420ebda..e480acf4 100644 --- a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp +++ b/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusControllerDetect.cpp @@ -74,4 +74,4 @@ void DetectRGBFusion2SMBusControllers(std::vector& busses, } /* DetectRGBFusion2SMBusControllers() */ // This detector is disabled as proper detection is not implemented -//REGISTER_DETECTOR(DetectRGBFusion2SMBusControllers); \ No newline at end of file +//REGISTER_DETECTOR("Gigabyte RGB Fusion 2 SMBus", DetectRGBFusion2SMBusControllers); diff --git a/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp b/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp index ca428167..69a17239 100644 --- a/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp +++ b/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp @@ -70,4 +70,4 @@ void DetectRGBFusion2USBControllers(std::vector &rgb_controllers hid_free_enumeration(info); } /* DetectRGBFusion2USBControllers() */ -REGISTER_DETECTOR(DetectRGBFusion2USBControllers); +REGISTER_DETECTOR("Gigabyte RGB Fusion 2 USB", DetectRGBFusion2USBControllers); diff --git a/Controllers/RGBFusionController/RGBFusionControllerDetect.cpp b/Controllers/RGBFusionController/RGBFusionControllerDetect.cpp index b887c8a1..4c006566 100644 --- a/Controllers/RGBFusionController/RGBFusionControllerDetect.cpp +++ b/Controllers/RGBFusionController/RGBFusionControllerDetect.cpp @@ -67,4 +67,4 @@ void DetectRGBFusionControllers(std::vector& busses, std:: } /* DetectRGBFusionControllers() */ -REGISTER_I2C_DETECTOR(DetectRGBFusionControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion", DetectRGBFusionControllers); diff --git a/Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp b/Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp index fe6cd063..d4102366 100644 --- a/Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp +++ b/Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp @@ -83,4 +83,4 @@ void DetectRGBFusionGPUControllers(std::vector& busses, st } /* DetectRGBFusionGPUControllers() */ -REGISTER_I2C_DETECTOR(DetectRGBFusionGPUControllers); \ No newline at end of file +REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion GPU", DetectRGBFusionGPUControllers); diff --git a/Controllers/RedragonController/RedragonControllerDetect.cpp b/Controllers/RedragonController/RedragonControllerDetect.cpp index 14f94a23..5d9f8ef7 100644 --- a/Controllers/RedragonController/RedragonControllerDetect.cpp +++ b/Controllers/RedragonController/RedragonControllerDetect.cpp @@ -126,4 +126,4 @@ void DetectRedragonControllers(std::vector& rgb_controllers) } } /* DetectRedragonControllers() */ -REGISTER_DETECTOR(DetectRedragonControllers); +REGISTER_DETECTOR("Redragon Peripheral", DetectRedragonControllers); diff --git a/Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp b/Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp index 258e8e37..765ac807 100644 --- a/Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp +++ b/Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp @@ -60,4 +60,4 @@ void DetectSapphireGPUControllers(std::vector& busses, std } /* DetectSapphireGPUControllers() */ // This detector is disabled as it does not properly detect -//REGISTER_I2C_DETECTOR(DetectSapphireGPUControllers); \ No newline at end of file +//REGISTER_I2C_DETECTOR("Sapphire GPU", DetectSapphireGPUControllers); diff --git a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp index b4992a79..92254ccf 100644 --- a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp @@ -158,4 +158,4 @@ void DetectSteelSeriesControllers(std::vector& rgb_controllers) } } /* DetectSteelSeriesControllers() */ -REGISTER_DETECTOR(DetectSteelSeriesControllers); +REGISTER_DETECTOR("SteelSeries", DetectSteelSeriesControllers); diff --git a/Controllers/TecknetController/TecknetControllerDetect.cpp b/Controllers/TecknetController/TecknetControllerDetect.cpp index 3a07e59e..4f2f322c 100644 --- a/Controllers/TecknetController/TecknetControllerDetect.cpp +++ b/Controllers/TecknetController/TecknetControllerDetect.cpp @@ -84,4 +84,4 @@ void DetectTecknetControllers(std::vector& rgb_controllers) hid_free_enumeration(info); } /* DetectTecknetControllers) */ -REGISTER_DETECTOR(DetectTecknetControllers); +REGISTER_DETECTOR("Tecknet", DetectTecknetControllers); diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp index 0f555345..ccab5bf3 100644 --- a/Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp +++ b/Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp @@ -56,4 +56,4 @@ void DetectThermaltakeRiingControllers(std::vector& rgb_controll } } /* DetectThermaltakeRiingControllers() */ -REGISTER_DETECTOR(DetectThermaltakeRiingControllers); +REGISTER_DETECTOR("Thermaltake Riing", DetectThermaltakeRiingControllers); diff --git a/Detector.h b/Detector.h index d4f667be..e77d1d2e 100644 --- a/Detector.h +++ b/Detector.h @@ -2,6 +2,6 @@ #include "DeviceDetector.h" -#define REGISTER_DETECTOR(func) static DeviceDetector device_detector_obj(func) -#define REGISTER_I2C_DETECTOR(func) static I2CDeviceDetector device_detector_obj(func) +#define REGISTER_DETECTOR(name, func) static DeviceDetector device_detector_obj(name, func) +#define REGISTER_I2C_DETECTOR(name, func) static I2CDeviceDetector device_detector_obj(name, func) #define REGISTER_I2C_BUS_DETECTOR(func) static I2CBusDetector device_detector_obj(func) diff --git a/DeviceDetector.h b/DeviceDetector.h index e03cfd5c..3483fff7 100644 --- a/DeviceDetector.h +++ b/DeviceDetector.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include "ResourceManager.h" @@ -8,18 +9,18 @@ class DeviceDetector { public: - DeviceDetector(DeviceDetectorFunction detector) + DeviceDetector(std::string name, DeviceDetectorFunction detector) { - ResourceManager::get()->RegisterDeviceDetector(detector); + ResourceManager::get()->RegisterDeviceDetector(name, detector); } }; class I2CDeviceDetector { public: - I2CDeviceDetector(I2CDeviceDetectorFunction detector) + I2CDeviceDetector(std::string name, I2CDeviceDetectorFunction detector) { - ResourceManager::get()->RegisterI2CDeviceDetector(detector); + ResourceManager::get()->RegisterI2CDeviceDetector(name, detector); } }; diff --git a/RGBController/E131ControllerDetect.cpp b/RGBController/E131ControllerDetect.cpp index a8822acb..86c2b839 100644 --- a/RGBController/E131ControllerDetect.cpp +++ b/RGBController/E131ControllerDetect.cpp @@ -172,4 +172,4 @@ void DetectE131Controllers(std::vector &rgb_controllers) } /* DetectE131Controllers() */ -REGISTER_DETECTOR(DetectE131Controllers); +REGISTER_DETECTOR("E1.31", DetectE131Controllers); diff --git a/RGBController/OpenRazerDetect.cpp b/RGBController/OpenRazerDetect.cpp index 6673f174..84b80f1e 100644 --- a/RGBController/OpenRazerDetect.cpp +++ b/RGBController/OpenRazerDetect.cpp @@ -123,4 +123,4 @@ void DetectOpenRazerControllers(std::vector &rgb_controllers) } /* DetectOpenRazerControllers() */ -REGISTER_DETECTOR(DetectOpenRazerControllers); \ No newline at end of file +REGISTER_DETECTOR("OpenRazer", DetectOpenRazerControllers); diff --git a/RGBController/OpenRazerWindowsDetect.cpp b/RGBController/OpenRazerWindowsDetect.cpp index 9ad84561..237c1317 100644 --- a/RGBController/OpenRazerWindowsDetect.cpp +++ b/RGBController/OpenRazerWindowsDetect.cpp @@ -252,4 +252,4 @@ void DetectOpenRazerControllers(std::vector &rgb_controllers) } /* DetectOpenRazerControllers() */ -REGISTER_DETECTOR(DetectOpenRazerControllers); \ No newline at end of file +REGISTER_DETECTOR("OpenRazer-Win32", DetectOpenRazerControllers); diff --git a/RGBController/RGBController_Faustus.cpp b/RGBController/RGBController_Faustus.cpp index 41da1d21..a8a476c3 100644 --- a/RGBController/RGBController_Faustus.cpp +++ b/RGBController/RGBController_Faustus.cpp @@ -1,5 +1,5 @@ #include "RGBController_Faustus.h" - +#include "Detector.h" #include #include @@ -170,4 +170,6 @@ void DetectFaustusControllers(std::vector &rgb_controllers) closedir(dir); if(found != 6) return; rgb_controllers.push_back(new RGBController_Faustus(base_path)); -} +} /* DetectFaustusControllers() */ + +REGISTER_DETECTOR("Faustus", DetectFaustusControllers); diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 0179d523..be53d270 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -53,13 +53,15 @@ void ResourceManager::RegisterI2CBusDetector(I2CBusDetectorFunction detector) i2c_bus_detectors.push_back(detector); } -void ResourceManager::RegisterI2CDeviceDetector(I2CDeviceDetectorFunction detector) +void ResourceManager::RegisterI2CDeviceDetector(std::string name, I2CDeviceDetectorFunction detector) { + i2c_device_detector_strings.push_back(name); i2c_device_detectors.push_back(detector); } -void ResourceManager::RegisterDeviceDetector(DeviceDetectorFunction detector) +void ResourceManager::RegisterDeviceDetector(std::string name, DeviceDetectorFunction detector) { + device_detector_strings.push_back(name); device_detectors.push_back(detector); } @@ -89,6 +91,11 @@ unsigned int ResourceManager::GetDetectionPercent() return(detection_percent); } +std::string ResourceManager::GetDetectionString() +{ + return(detection_string); +} + void ResourceManager::DetectDevices() { /*-------------------------------------------------*\ @@ -122,6 +129,9 @@ void ResourceManager::DetectDevicesThreadFunction() \*-------------------------------------------------*/ for(int i2c_detector_idx = 0; i2c_detector_idx < i2c_device_detectors.size(); i2c_detector_idx++) { + detection_string = i2c_device_detector_strings[i2c_detector_idx]; + DeviceListChanged(); + i2c_device_detectors[i2c_detector_idx](busses, rgb_controllers); /*-------------------------------------------------*\ @@ -144,6 +154,9 @@ void ResourceManager::DetectDevicesThreadFunction() \*-------------------------------------------------*/ for(int detector_idx = 0; detector_idx < device_detectors.size(); detector_idx++) { + detection_string = device_detector_strings[detector_idx]; + DeviceListChanged(); + device_detectors[detector_idx](rgb_controllers); /*-------------------------------------------------*\ diff --git a/ResourceManager.h b/ResourceManager.h index d19ccc7f..ccb0e029 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "i2c_smbus.h" #include "RGBController.h" @@ -29,12 +30,13 @@ public: std::vector & GetRGBControllers(); void RegisterI2CBusDetector (I2CBusDetectorFunction detector); - void RegisterDeviceDetector (DeviceDetectorFunction detector); - void RegisterI2CDeviceDetector (I2CDeviceDetectorFunction detector); + void RegisterDeviceDetector (std::string name, DeviceDetectorFunction detector); + void RegisterI2CDeviceDetector (std::string name, I2CDeviceDetectorFunction detector); void RegisterDeviceListChangeCallback(ResourceManagerCallback new_callback, void * new_callback_arg); unsigned int GetDetectionPercent(); + std::string GetDetectionString(); void DeviceListChanged(); @@ -46,12 +48,15 @@ private: static std::unique_ptr instance; unsigned int detection_percent; + std::string detection_string; std::vector busses; std::vector rgb_controllers; std::vector device_detectors; + std::vector device_detector_strings; std::vector i2c_bus_detectors; std::vector i2c_device_detectors; + std::vector i2c_device_detector_strings; std::thread * DetectDevicesThread; diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 2a2ff787..ef4e18ea 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -417,6 +417,9 @@ void OpenRGBDialog2::on_ClientListUpdated() ui->DetectionProgressBar->setRange(0, 100); ui->DetectionProgressBar->setValue(ResourceManager::get()->GetDetectionPercent()); + ui->DetectionProgressBar->setTextVisible(true); + ui->DetectionProgressBar->setFormat("Detecting " + QString::fromStdString(ResourceManager::get()->GetDetectionString())); + ui->DetectionProgressBar->setAlignment(Qt::AlignCenter); if(ResourceManager::get()->GetDetectionPercent() == 100) {