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

Store name in ValkyrieKeyboardController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-14 22:31:59 -05:00
parent fcce668d66
commit ef6241fe38
4 changed files with 57 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp
View file

@ -274,7 +274,7 @@ RGBController_ValkyrieKeyboard::RGBController_ValkyrieKeyboard(ValkyrieKeyboardC
{
controller = controller_ptr;
name = "Valkyrie Keyboard Device";
name = controller->GetNameString();
vendor = "Valkyrie";
type = DEVICE_TYPE_KEYBOARD;
description = "Valkyrie Keyboard Device";

8
Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp
View file

@ -14,10 +14,11 @@
#include "StringUtils.h"
#include "ValkyrieKeyboardController.h"
ValkyrieKeyboardController::ValkyrieKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid, const int interface)
ValkyrieKeyboardController::ValkyrieKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid, const int interface, std::string dev_name)
{
dev = dev_handle;
location = path;
name = dev_name;
usb_pid = pid;
interface_num = interface;
}
@ -32,6 +33,11 @@ std::string ValkyrieKeyboardController::GetDeviceLocation()
return("HID: " + location);
}
std::string ValkyrieKeyboardController::GetNameString()
{
return(name);
}
std::string ValkyrieKeyboardController::GetSerialString()
{
wchar_t serial_string[128];

8
Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.h
View file

@ -30,10 +30,11 @@
class ValkyrieKeyboardController
{
public:
ValkyrieKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid, const int interface);
ValkyrieKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid, const int interface, std::string dev_name);
~ValkyrieKeyboardController();
std::string GetDeviceLocation();
std::string GetNameString();
std::string GetSerialString();
unsigned short GetUSBPID();
int GetInterfaceNum();
@ -47,11 +48,10 @@ public:
private:
hid_device* dev;
std::string location;
std::string name;
unsigned short usb_pid;
int interface_num;
void SendInitializeColorPacket();
void SendTerminateColorPacket();
int key_code_99[98] =
{
0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x77,
@ -73,4 +73,6 @@ private:
0x62,0x63,0x64,0x66,0x68,0x69
};
void SendInitializeColorPacket();
void SendTerminateColorPacket();
};

3
Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp
View file

@ -20,9 +20,8 @@ void DetectValkyrieKeyboardControllers(hid_device_info* info, const std::string&
if(dev)
{
ValkyrieKeyboardController* controller = new ValkyrieKeyboardController(dev, info->path, info->product_id, info->interface_number);
ValkyrieKeyboardController* controller = new ValkyrieKeyboardController(dev, info->path, info->product_id, info->interface_number, name);
RGBController_ValkyrieKeyboard* rgb_controller = new RGBController_ValkyrieKeyboard(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}