jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use hidapi wrapper for HyperX mousemat controller

Browse source
This commit is contained in:
Adam Honse 2023-01-28 11:46:31 -06:00
parent e30fbdef71
commit 4c67d849b4
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Controllers/HyperXMousematController/HyperXMousematController.cpp
View file

@ -11,15 +11,16 @@
#include <cstring>
HyperXMousematController::HyperXMousematController(hid_device* dev_handle, const char* path)
HyperXMousematController::HyperXMousematController(hidapi_wrapper hid_wrapper, hid_device* dev_handle, const char* path)
{
wrapper = hid_wrapper;
dev = dev_handle;
location = path;
}
HyperXMousematController::~HyperXMousematController()
{
hid_close(dev);
wrapper.hid_close(dev);
}
std::string HyperXMousematController::GetDeviceLocation()
@ -30,7 +31,7 @@ std::string HyperXMousematController::GetDeviceLocation()
std::string HyperXMousematController::GetSerialString()
{
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
int ret = wrapper.hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
@ -71,7 +72,7 @@ void HyperXMousematController::SendDirect
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_send_feature_report(dev, buf, 65);
wrapper.hid_send_feature_report(dev, buf, 65);
/*-----------------------------------------------------*\
| Zero out buffer |
@ -94,7 +95,7 @@ void HyperXMousematController::SendDirect
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_send_feature_report(dev, buf, 65);
wrapper.hid_send_feature_report(dev, buf, 65);
/*-----------------------------------------------------*\
| Zero out buffer |
@ -114,5 +115,5 @@ void HyperXMousematController::SendDirect
buf[(i * 4) + 4] = RGBGetBValue(color_data[16 + i]);
}
hid_send_feature_report(dev, buf, 65);
wrapper.hid_send_feature_report(dev, buf, 65);
}

6
Controllers/HyperXMousematController/HyperXMousematController.h
View file

@ -10,14 +10,15 @@
#include "RGBController.h"
#include <string>
#include <hidapi/hidapi.h>
#include "hidapi_wrapper.h"
#pragma once
class HyperXMousematController
{
public:
HyperXMousematController(hid_device* dev_handle, const char* path);
HyperXMousematController(hidapi_wrapper hid_wrapper, hid_device* dev_handle, const char* path);
~HyperXMousematController();
std::string GetDeviceLocation();
@ -29,6 +30,7 @@ public:
);
private:
hidapi_wrapper wrapper;
hid_device* dev;
std::string location;
};

13
Controllers/HyperXMousematController/HyperXMousematControllerDetect.cpp
View file

@ -3,7 +3,8 @@
#include "RGBController.h"
#include "RGBController_HyperXMousemat.h"
#include <vector>
#include <hidapi/hidapi.h>
#include "hidapi_wrapper.h"
/*-----------------------------------------------------*\
| HyperX mousemat vendor IDs |
@ -22,13 +23,13 @@
* *
\******************************************************************************************/
void DetectHyperXMousematControllers(hid_device_info* info, const std::string& name)
void DetectHyperXMousematControllers(hidapi_wrapper wrapper, hid_device_info* info, const std::string& name)
{
hid_device* dev = hid_open_path(info->path);
hid_device* dev = wrapper.hid_open_path(info->path);
if(dev)
{
HyperXMousematController* controller = new HyperXMousematController(dev, info->path);
HyperXMousematController* controller = new HyperXMousematController(wrapper, dev, info->path);
RGBController_HyperXMousemat* rgb_controller = new RGBController_HyperXMousemat(controller);
rgb_controller->name = name;
@ -36,5 +37,5 @@ void DetectHyperXMousematControllers(hid_device_info* info, const std::string& n
}
} /* DetectHyperXMousematControllers() */
REGISTER_HID_DETECTOR_I("HyperX Fury Ultra", DetectHyperXMousematControllers, HYPERX_VID, HYPERX_FURY_ULTRA_PID, 0);
REGISTER_HID_DETECTOR_IPU("HyperX Pulsefire Mat", DetectHyperXMousematControllers, HYPERX_VID_2, HYPERX_PULSEFIRE_PID, 1, 0xFF90, 0xFF00);
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);