mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-01-21 21:47:54 -05:00
Move HID detector calls to RunHIDDetector/RunHIDWrappedDetector functions and return controller list from detector functions
This commit is contained in:
@@ -13,9 +13,11 @@
|
||||
|
||||
#include <vector>
|
||||
#include <hidapi.h>
|
||||
#include "DetectionManager.h"
|
||||
#include "RGBController_SonyDS4.h"
|
||||
#include "RGBController_SonyDualSense.h"
|
||||
#include "DetectionManager.h"
|
||||
#include "SonyDS4Controller.h"
|
||||
#include "SonyDualSenseController.h"
|
||||
|
||||
#define SONY_VID 0x054C
|
||||
|
||||
@@ -25,31 +27,41 @@
|
||||
#define SONY_DUALSENSE_PID 0x0CE6
|
||||
#define SONY_DUALSENSE_EDGE_PID 0x0DF2
|
||||
|
||||
void DetectSonyDS4Controllers(hid_device_info* info, const std::string&)
|
||||
DetectedControllers DetectSonyDS4Controllers(hid_device_info* info, const std::string&)
|
||||
{
|
||||
hid_device* dev = hid_open_path(info->path);
|
||||
DetectedControllers detected_controllers;
|
||||
hid_device* dev;
|
||||
|
||||
dev = hid_open_path(info->path);
|
||||
|
||||
if(dev)
|
||||
{
|
||||
SonyDS4Controller* controller = new SonyDS4Controller(dev, info->path);
|
||||
RGBController_SonyDS4* rgb_controller = new RGBController_SonyDS4(controller);
|
||||
|
||||
DetectionManager::get()->RegisterRGBController(rgb_controller);
|
||||
detected_controllers.push_back(rgb_controller);
|
||||
}
|
||||
|
||||
return(detected_controllers);
|
||||
}
|
||||
|
||||
void DetectSonyDualSenseControllers(hid_device_info* info, const std::string& name)
|
||||
DetectedControllers DetectSonyDualSenseControllers(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)
|
||||
{
|
||||
bool is_bluetooth = info->interface_number == -1;
|
||||
bool is_bluetooth = (info->interface_number == -1);
|
||||
SonyDualSenseController* controller = new SonyDualSenseController(dev, info->path, is_bluetooth, name);
|
||||
RGBController_SonyDualSense* rgb_controller = new RGBController_SonyDualSense(controller);
|
||||
|
||||
DetectionManager::get()->RegisterRGBController(rgb_controller);
|
||||
detected_controllers.push_back(rgb_controller);
|
||||
}
|
||||
|
||||
return(detected_controllers);
|
||||
}
|
||||
|
||||
REGISTER_HID_DETECTOR("Sony DualShock 4", DetectSonyDS4Controllers, SONY_VID, SONY_DS4_V1_PID);
|
||||
|
||||
Reference in New Issue
Block a user