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

Store name in NZXTMouseController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-14 19:00:39 -05:00
parent 3ab1519e25
commit e418aa7f95
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Controllers/NZXTMouseController/NZXTMouseController.cpp
View file

@ -13,10 +13,11 @@
#include "NZXTMouseController.h"
#include "StringUtils.h"
NZXTMouseController::NZXTMouseController(hid_device* dev_handle, const char* path)
NZXTMouseController::NZXTMouseController(hid_device* dev_handle, const char* path, std::string dev_name)
{
dev = dev_handle;
location = path;
name = dev_name;
/*-----------------------------------------------------*\
| Request firmware version |
@ -39,6 +40,11 @@ std::string NZXTMouseController::GetLocation()
return("HID: " + location);
}
std::string NZXTMouseController::GetName()
{
return(name);
}
std::string NZXTMouseController::GetSerialString()
{
wchar_t serial_string[128];

4
Controllers/NZXTMouseController/NZXTMouseController.h
View file

@ -19,11 +19,12 @@
class NZXTMouseController
{
public:
NZXTMouseController(hid_device* dev_handle, const char* path);
NZXTMouseController(hid_device* dev_handle, const char* path, std::string dev_name);
~NZXTMouseController();
std::string GetFirmwareVersion();
std::string GetLocation();
std::string GetName();
std::string GetSerialString();
void SetLEDs
@ -36,6 +37,7 @@ private:
char firmware_version[16];
std::string location;
std::string name;
void SendFirmwareRequest();
};

3
Controllers/NZXTMouseController/NZXTMouseControllerDetect.cpp
View file

@ -34,9 +34,8 @@ static void DetectNZXTMouseControllers(hid_device_info* info, const std::string&
if(dev)
{
NZXTMouseController* controller = new NZXTMouseController(dev, info->path);
NZXTMouseController* controller = new NZXTMouseController(dev, info->path, name);
RGBController_NZXTMouse* rgb_controller = new RGBController_NZXTMouse(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}

2
Controllers/NZXTMouseController/RGBController_NZXTMouse.cpp
View file

@ -26,7 +26,7 @@ RGBController_NZXTMouse::RGBController_NZXTMouse(NZXTMouseController* controller
{
controller = controller_ptr;
name = "NZXT Mouse";
name = controller->GetName();
vendor = "NZXT";
type = DEVICE_TYPE_MOUSE;
description = "NZXT Mouse Device";