mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-02-23 01:37:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Split out detection system from ResourceManager into DetectionManager

Browse Source 
* Split detection system out into its own class, DetectionManager
    * Clean up ResourceManger's many callbacks into just two, one for detection and one general purpose
This commit is contained in:
Adam Honse
2026-01-08 23:35:50 -06:00
parent 42a321084a
commit ca72e084eb
221 changed files with 3149 additions and 2776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Controllers/QMKController/QMKOpenRGBController/QMKOpenRGBBaseController.cpp
View File

@@ -10,9 +10,10 @@
\*---------------------------------------------------------*/
#include "LogManager.h"
#include "QMKOpenRGBBaseController.h"
#include "ResourceManager.h"
#include "RGBControllerKeyNames.h"
#include "SettingsManager.h"
#include "QMKOpenRGBBaseController.h"
using namespace std::chrono_literals;

15
Controllers/QMKController/QMKOpenRGBController/QMKOpenRGBControllerDetect.cpp
View File

@@ -12,15 +12,16 @@
#include <string>
#include <hidapi.h>
#include "Detector.h"
#include "DetectionManager.h"
#include "LogManager.h"
#include "QMKOpenRGBRev9Controller.h"
#include "QMKOpenRGBRevBController.h"
#include "QMKOpenRGBRevDController.h"
#include "ResourceManager.h"
#include "RGBController_QMKOpenRGBRev9.h"
#include "RGBController_QMKOpenRGBRevB.h"
#include "RGBController_QMKOpenRGBRevD.h"
#include "RGBController_QMKOpenRGBRevE.h"
#include "LogManager.h"
#include "SettingsManager.h"
/*-----------------------------------------------------*\
@@ -82,35 +83,35 @@ void DetectQMKOpenRGBControllers(hid_device_info *info, const std::string&)
{
QMKOpenRGBRev9Controller* controller = new QMKOpenRGBRev9Controller(dev, info->path);
RGBController_QMKOpenRGBRev9* rgb_controller = new RGBController_QMKOpenRGBRev9(controller);
ResourceManager::get()->RegisterRGBController(rgb_controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
}
break;
case QMK_OPENRGB_PROTOCOL_VERSION_B:
{
QMKOpenRGBRevBController* controller = new QMKOpenRGBRevBController(dev, info->path);
RGBController_QMKOpenRGBRevB* rgb_controller = new RGBController_QMKOpenRGBRevB(controller, false);
ResourceManager::get()->RegisterRGBController(rgb_controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
}
break;
case QMK_OPENRGB_PROTOCOL_VERSION_C:
{
QMKOpenRGBRevBController* controller = new QMKOpenRGBRevBController(dev, info->path);
RGBController_QMKOpenRGBRevB* rgb_controller = new RGBController_QMKOpenRGBRevB(controller, true);
ResourceManager::get()->RegisterRGBController(rgb_controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
}
break;
case QMK_OPENRGB_PROTOCOL_VERSION_D:
{
QMKOpenRGBRevDController* controller = new QMKOpenRGBRevDController(dev, info->path);
RGBController_QMKOpenRGBRevD* rgb_controller = new RGBController_QMKOpenRGBRevD(controller, true);
ResourceManager::get()->RegisterRGBController(rgb_controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
}
break;
case QMK_OPENRGB_PROTOCOL_VERSION_E:
{
QMKOpenRGBRevDController* controller = new QMKOpenRGBRevDController(dev, info->path);
RGBController_QMKOpenRGBRevE* rgb_controller = new RGBController_QMKOpenRGBRevE(controller, true);
ResourceManager::get()->RegisterRGBController(rgb_controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
}
break;
default:

5
Controllers/QMKController/QMKVialRGBController/QMKVialRGBControllerDetect.cpp
View File

@@ -11,8 +11,9 @@
#include <string>
#include <hidapi.h>
#include "Detector.h"
#include "DetectionManager.h"
#include "QMKVialRGBController.h"
#include "ResourceManager.h"
#include "RGBController_QMKVialRGB.h"
#include "SettingsManager.h"
@@ -39,7 +40,7 @@ void DetectQMKVialRGBControllers(hid_device_info *info, const std::string&)
if(controller->GetSupported())
{
RGBController_QMKVialRGB* rgb_controller = new RGBController_QMKVialRGB(controller);
ResourceManager::get()->RegisterRGBController(rgb_controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
}
else
{