mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-05-19 03:56:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Store name in LogitechControllers to avoid setting it in detectors

Browse Source
This commit is contained in:
Adam Honse
2025-08-16 16:47:44 -05:00
parent 86fbdfa6e7
commit a0726dc065
35 changed files with 258 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp
View File

@@ -13,10 +13,11 @@
#include "LogitechGProKeyboardController.h"
#include "StringUtils.h"
LogitechGProKeyboardController::LogitechGProKeyboardController(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12)
LogitechGProKeyboardController::LogitechGProKeyboardController(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12, std::string dev_name)
{
dev_pkt_0x11 = dev_handle_0x11;
dev_pkt_0x12 = dev_handle_0x12;
dev_pkt_0x11 = dev_handle_0x11;
dev_pkt_0x12 = dev_handle_0x12;
name = dev_name;
}
LogitechGProKeyboardController::~LogitechGProKeyboardController()
@@ -25,6 +26,11 @@ LogitechGProKeyboardController::~LogitechGProKeyboardController()
hid_close(dev_pkt_0x12);
}
std::string LogitechGProKeyboardController::GetNameString()
{
return(name);
}
std::string LogitechGProKeyboardController::GetSerialString()
{
wchar_t serial_string[128];

6
Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.h
View File

@@ -52,13 +52,14 @@ enum
class LogitechGProKeyboardController
{
public:
LogitechGProKeyboardController(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12);
LogitechGProKeyboardController(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12, std::string dev_name);
~LogitechGProKeyboardController();
std::string GetNameString();
std::string GetSerialString();
void Commit();
void SetDirect
(
unsigned char zone,
@@ -78,6 +79,7 @@ public:
private:
hid_device* dev_pkt_0x11;
hid_device* dev_pkt_0x12;
std::string name;
void SendDirectFrame
(

12
Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.cpp
View File

@@ -158,13 +158,13 @@ static const led_type led_names[] =
RGBController_LogitechGProKeyboard::RGBController_LogitechGProKeyboard(LogitechGProKeyboardController* controller_ptr)
{
controller = controller_ptr;
controller = controller_ptr;
name = "Logitech Keyboard Device";
vendor = "Logitech";
type = DEVICE_TYPE_KEYBOARD;
description = "Logitech Keyboard Device";
serial = controller->GetSerialString();
name = controller->GetNameString();
vendor = "Logitech";
type = DEVICE_TYPE_KEYBOARD;
description = "Logitech Keyboard Device";
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";