mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-01-22 14:07:53 -05: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 22a9e3ced2
commit ed62663153
197 changed files with 4481 additions and 4332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp
View File

@@ -14,34 +14,28 @@
#include "RGBController_DasKeyboard.h"
#include <hidapi.h>
/*-----------------------------------------------------*\
| Das Keyboard vendor ID |
\*-----------------------------------------------------*/
/*---------------------------------------------------------*\
| Das Keyboard vendor ID |
\*---------------------------------------------------------*/
#define DAS_KEYBOARD_VID 0x24F0
/*-----------------------------------------------------*\
| Keyboard product IDs |
\*-----------------------------------------------------*/
/*---------------------------------------------------------*\
| Keyboard product IDs |
\*---------------------------------------------------------*/
#define DAS_KEYBOARD_Q4_PID 0x2037
#define DAS_KEYBOARD_Q5_PID 0x2020
#define DAS_KEYBOARD_Q5S_PID 0x209A
/******************************************************************************************\
* *
* DetectDasKeyboardControllers *
* *
* Tests the USB address to see if a Das Keyboard RGB controller exists there. *
* We need the second interface to communicate with the keyboard *
* *
\******************************************************************************************/
void DetectDasKeyboardControllers(hid_device_info *info, const std::string &name)
DetectedControllers DetectDasKeyboardControllers(hid_device_info *info, const std::string &name)
{
hid_device *dev = hid_open_path(info->path);
DetectedControllers detected_controllers;
hid_device* dev;
dev = hid_open_path(info->path);
if(dev)
{
DasKeyboardController *controller = new DasKeyboardController(dev, info->path, name);
DasKeyboardController* controller = new DasKeyboardController(dev, info->path, name);
if(controller->GetLayoutString() == "NONE")
{
@@ -49,12 +43,14 @@ void DetectDasKeyboardControllers(hid_device_info *info, const std::string &name
}
else
{
RGBController_DasKeyboard *rgb_controller = new RGBController_DasKeyboard(controller);
RGBController_DasKeyboard* rgb_controller = new RGBController_DasKeyboard(controller);
DetectionManager::get()->RegisterRGBController(rgb_controller);
detected_controllers.push_back(rgb_controller);
}
}
} /* DetectDasKeyboardControllers() */
return(detected_controllers);
}
REGISTER_HID_DETECTOR_IPU("Das Keyboard Q4 RGB", DetectDasKeyboardControllers, DAS_KEYBOARD_VID, DAS_KEYBOARD_Q4_PID, 1, 0x01, 0x80);
REGISTER_HID_DETECTOR_I ("Das Keyboard Q5 RGB", DetectDasKeyboardControllers, DAS_KEYBOARD_VID, DAS_KEYBOARD_Q5_PID, 1);