mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-04-04 22:24:12 -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
2026-01-12 19:05:21 -06:00
parent 04123aa969
commit 03f0977205
196 changed files with 4471 additions and 4333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Controllers/YeelightController/YeelightControllerDetect.cpp
View File

@@ -10,31 +10,24 @@
\*---------------------------------------------------------*/
#include "DetectionManager.h"
#include "YeelightController.h"
#include "ResourceManager.h"
#include "RGBController_Yeelight.h"
#include "SettingsManager.h"
#include "YeelightController.h"
/******************************************************************************************\
* *
* DetectYeelightControllers *
* *
* Detect Yeelight devices *
* *
\******************************************************************************************/
void DetectYeelightControllers()
DetectedControllers DetectYeelightControllers()
{
json yeelight_settings;
DetectedControllers detected_controllers;
json yeelight_settings;
/*-------------------------------------------------*\
| Get Yeelight settings from settings manager |
\*-------------------------------------------------*/
/*-----------------------------------------------------*\
| Get Yeelight settings from settings manager |
\*-----------------------------------------------------*/
yeelight_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("YeelightDevices");
/*-------------------------------------------------*\
| If the Yeelight settings contains devices, process|
\*-------------------------------------------------*/
/*-----------------------------------------------------*\
| If the Yeelight settings contains devices, process |
\*-----------------------------------------------------*/
if(yeelight_settings.contains("devices"))
{
for(unsigned int device_idx = 0; device_idx < yeelight_settings["devices"].size(); device_idx++)
@@ -59,11 +52,12 @@ void DetectYeelightControllers()
YeelightController* controller = new YeelightController(yeelight_ip, yeelight_host_ip, music_mode);
RGBController_Yeelight* rgb_controller = new RGBController_Yeelight(controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
detected_controllers.push_back(rgb_controller);
}
}
}
} /* DetectYeelightControllers() */
return(detected_controllers);
}
REGISTER_DETECTOR("Yeelight", DetectYeelightControllers);