Use HID path for Location on SteelSeries Rival controller

This commit is contained in:
Adam Honse
2020-10-05 00:28:37 -05:00
parent 07dc0ce988
commit 0e7f2b9fc1
4 changed files with 18 additions and 7 deletions

View File

@@ -13,9 +13,10 @@ RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalC
{
rival = rival_ptr;
name = rival_ptr->GetDeviceName();
name = rival->GetDeviceName();
type = DEVICE_TYPE_MOUSE;
description = "SteelSeries Rival Device";
location = rival->GetDeviceLocation();
mode Static;
Static.name = "Static";

View File

@@ -148,7 +148,7 @@ void DetectSteelSeriesControllers(std::vector<RGBController*>& rgb_controllers)
case DEVICE_TYPE_MOUSE:
{
SteelSeriesRivalController* controller = new SteelSeriesRivalController(dev, device_list[device_idx].proto_type);
SteelSeriesRivalController* controller = new SteelSeriesRivalController(dev, device_list[device_idx].proto_type, info->path);
RGBController_SteelSeriesRival* rgb_controller = new RGBController_SteelSeriesRival(controller);
rgb_controller->name = device_list[device_idx].name;

View File

@@ -30,11 +30,13 @@ static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
SteelSeriesRivalController::SteelSeriesRivalController
(
hid_device* dev_handle,
steelseries_type proto_type
steelseries_type proto_type,
const char* path
)
{
dev = dev_handle;
proto = proto_type;
dev = dev_handle;
location = path;
proto = proto_type;
}
SteelSeriesRivalController::~SteelSeriesRivalController()
@@ -42,6 +44,11 @@ SteelSeriesRivalController::~SteelSeriesRivalController()
}
std::string SteelSeriesRivalController::GetDeviceLocation()
{
return(location);
}
char* SteelSeriesRivalController::GetDeviceName()
{
return device_name;

View File

@@ -36,12 +36,14 @@ public:
SteelSeriesRivalController
(
hid_device* dev_handle,
steelseries_type proto_type
steelseries_type proto_type,
const char* path
);
~SteelSeriesRivalController();
char* GetDeviceName();
std::string GetDeviceLocation();
char* GetDeviceName();
steelseries_type GetMouseType();
@@ -75,5 +77,6 @@ public:
private:
char device_name[32];
hid_device* dev;
std::string location;
steelseries_type proto;
};