mirror/OpenRGB
1
0 Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-08-07 02:42:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move HID detector calls to RunHIDDetector/RunHIDWrappedDetector functions and return controller list from detector functions

Browse Source
This commit is contained in:
Adam Honse committed 2026-06-03 10:10:26 -05:00
1 parent f732f57a4c
commit 614f95a30a
199 files changed
+4551 -4376
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp
+13 -17
View File
@@ -14,14 +14,14 @@
#include "CorsairHydroController.h"
#include "RGBController_CorsairHydro.h"
/*-----------------------------------------------------*\
| Corsair vendor ID |
\*-----------------------------------------------------*/
/*---------------------------------------------------------*\
| Corsair vendor ID |
\*---------------------------------------------------------*/
#define CORSAIR_VID 0x1B1C
/*-----------------------------------------------------*\
| Keyboard Hydro Series product IDs |
\*-----------------------------------------------------*/
/*---------------------------------------------------------*\
| Keyboard Hydro Series product IDs |
\*---------------------------------------------------------*/
#define CORSAIR_H115I_PRO_RGB_PID 0x0C13
#define CORSAIR_H100I_PRO_RGB_PID 0x0C15
#define CORSAIR_H150I_PRO_RGB_PID 0x0C12
@@ -46,16 +46,10 @@ static const corsair_hydro_device device_list[] =
{ CORSAIR_VID, CORSAIR_H150I_PRO_RGB_PID, 0, "Corsair H150i PRO RGB" },
};
/******************************************************************************************\
* *
* DetectCorsairHydroControllers *
* *
* Tests the USB address to see if a Corsair RGB Cooler controller exists there. *
* *
\******************************************************************************************/
void DetectCorsairHydroControllers()
DetectedControllers DetectCorsairHydroControllers()
{
DetectedControllers detected_controllers;
libusb_init(NULL);
#ifdef _WIN32
@@ -75,10 +69,12 @@ void DetectCorsairHydroControllers()
CorsairHydroController* controller = new CorsairHydroController(dev, device_list[device_idx].name);
RGBController_CorsairHydro* rgb_controller = new RGBController_CorsairHydro(controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
detected_controllers.push_back(rgb_controller);
}
}
} /* DetectCorsairHydroControllers() */
return(detected_controllers);
}
REGISTER_DETECTOR("Corsair Hydro Series", DetectCorsairHydroControllers);
/*---------------------------------------------------------------------------------------------------------*\