mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-01-21 21:47:54 -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 c46540339a
commit 8f29ad126e
191 changed files with 4362 additions and 4242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Controllers/HyperXMousematController/HyperXMousematControllerDetect.cpp
View File

@@ -10,13 +10,13 @@
\*---------------------------------------------------------*/
#include "DetectionManager.h"
#include "hidapi_wrapper.h"
#include "HyperXMousematController.h"
#include "RGBController_HyperXMousemat.h"
#include "hidapi_wrapper.h"
/*-----------------------------------------------------*\
| HyperX mousemat vendor IDs |
\*-----------------------------------------------------*/
/*---------------------------------------------------------*\
| HyperX mousemat vendor IDs |
\*---------------------------------------------------------*/
#define HYPERX_VID 0x0951
#define HYPERX_FURY_ULTRA_PID 0x1705
#define HYPERX_FURY_A_XL_PID 0x1741
@@ -24,17 +24,12 @@
#define HYPERX_VID_2 0x03F0
#define HYPERX_PULSEFIRE_PID 0x0F8D
/******************************************************************************************\
* *
* DetectHyperXMousematControllers *
* *
* Tests the USB address to see if a HyperX Mousemat controller exists there. *
* *
\******************************************************************************************/
void DetectHyperXMousematControllers(hidapi_wrapper wrapper, hid_device_info* info, const std::string& name)
DetectedControllers DetectHyperXMousematControllers(hidapi_wrapper wrapper, hid_device_info* info, const std::string& name)
{
hid_device* dev = wrapper.hid_open_path(info->path);
DetectedControllers detected_controllers;
hid_device* dev;
dev = wrapper.hid_open_path(info->path);
if(dev)
{
@@ -44,9 +39,11 @@ void DetectHyperXMousematControllers(hidapi_wrapper wrapper, hid_device_info* in
HyperXMousematController* controller = new HyperXMousematController(wrapper, dev, info->path, name);
RGBController_HyperXMousemat* rgb_controller = new RGBController_HyperXMousemat(controller, first_zone_leds_count, second_zone_leds_count);
DetectionManager::get()->RegisterRGBController(rgb_controller);
detected_controllers.push_back(rgb_controller);
}
} /* DetectHyperXMousematControllers() */
return(detected_controllers);
}
REGISTER_HID_WRAPPED_DETECTOR_I("HyperX Fury Ultra", DetectHyperXMousematControllers, HYPERX_VID, HYPERX_FURY_ULTRA_PID, 0);
REGISTER_HID_WRAPPED_DETECTOR_IPU("HyperX Pulsefire Mat", DetectHyperXMousematControllers, HYPERX_VID_2, HYPERX_PULSEFIRE_PID, 1, 0xFF90, 0xFF00);