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

Removed hid_get_device_info() function to correct CI/CD pipelines

Browse source 
* Regression introduced in dbeabe61
* Removed unrequired includes
* Aligned other variables and structures to ensure feature parity
This commit is contained in:
Chris M 2023-11-09 19:27:50 +11:00
parent 44610cf326
commit a689db4d3d
4 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Controllers/LianLiController/LianLiControllerDetect.cpp
View file

@ -233,6 +233,7 @@ void DetectLianLiGAIITrinity(hid_device_info* info, const std::string& /*name*/)
{
LianLiGAIITrinityController* controller = new LianLiGAIITrinityController(dev);
RGBController_LianLiGAIITrinity* rgb_controller = new RGBController_LianLiGAIITrinity(controller);
rgb_controller->location = "HID: " + std::string(info->path);
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}

11
Controllers/LianLiController/LianLiGAIITrinityController.cpp
View file

@ -29,13 +29,12 @@ LianLiGAIITrinityController::GAII_Info LianLiGAIITrinityController::GetControlle
{
GAII_Info controllerInfo;
hid_device_info* hidInfo = hid_get_device_info(dev);
// get device location
controllerInfo.location = "HID: " + std::string(hidInfo->path);
// get serial number
std::wstring serialWStr(hidInfo->serial_number);
const uint8_t sz = 255;
wchar_t tmp[sz];
hid_get_serial_number_string(dev, tmp, sz);
std::wstring serialWStr = std::wstring(tmp);
controllerInfo.serial = std::string(serialWStr.begin(), serialWStr.end());
// get firmware version

6
Controllers/LianLiController/LianLiGAIITrinityController.h
View file

@ -9,11 +9,6 @@
#include "RGBController.h"
#include "hidapi/hidapi.h"
#include <vector>
#ifdef __FreeBSD__
#include <libusb.h>
#else
#include <libusb-1.0/libusb.h>
#endif
#pragma once
@ -26,7 +21,6 @@ class LianLiGAIITrinityController
public:
struct GAII_Info
{
std::string location;
std::string serial;
std::string version;
};

1
Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp
View file

@ -31,7 +31,6 @@ RGBController_LianLiGAIITrinity::RGBController_LianLiGAIITrinity(LianLiGAIITrini
LianLiGAIITrinityController::GAII_Info controllerInfo = controller->GetControllerInfo();
version = controllerInfo.version;
location = controllerInfo.location;
serial = controllerInfo.serial;
mode Rainbow;