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

Store name in KeychronKeyboardController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-11 18:29:59 -05:00
parent ca73941e5d
commit a1f144daf2
4 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Controllers/KeychronKeyboardController/KeychronKeyboardController.cpp
View file

@ -15,11 +15,11 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
KeychronKeyboardController::KeychronKeyboardController(hid_device* dev_handle, const hid_device_info& info) KeychronKeyboardController::KeychronKeyboardController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
{ {
dev = dev_handle; dev = dev_handle;
version = "";
location = info.path; location = info.path;
name = dev_name;
} }
KeychronKeyboardController::~KeychronKeyboardController() KeychronKeyboardController::~KeychronKeyboardController()
@ -32,6 +32,11 @@ std::string KeychronKeyboardController::GetDeviceLocation()
return("HID: " + location); return("HID: " + location);
} }
std::string KeychronKeyboardController::GetNameString()
{
return(name);
}
std::string KeychronKeyboardController::GetSerialString() std::string KeychronKeyboardController::GetSerialString()
{ {
wchar_t serial_string[128]; wchar_t serial_string[128];
@ -45,11 +50,6 @@ std::string KeychronKeyboardController::GetSerialString()
return(StringUtils::wstring_to_string(serial_string)); return(StringUtils::wstring_to_string(serial_string));
} }
std::string KeychronKeyboardController::GetFirmwareVersion()
{
return(version);
}
void KeychronKeyboardController:: SetLedSequencePositions(std::vector<unsigned int> positions) void KeychronKeyboardController:: SetLedSequencePositions(std::vector<unsigned int> positions)
{ {
led_sequence_positions = positions; led_sequence_positions = positions;

7
Controllers/KeychronKeyboardController/KeychronKeyboardController.h
View file

@ -91,12 +91,12 @@ enum
class KeychronKeyboardController class KeychronKeyboardController
{ {
public: public:
KeychronKeyboardController(hid_device* dev_handle, const hid_device_info& info); KeychronKeyboardController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
~KeychronKeyboardController(); ~KeychronKeyboardController();
std::string GetSerialString();
std::string GetDeviceLocation(); std::string GetDeviceLocation();
std::string GetFirmwareVersion(); std::string GetNameString();
std::string GetSerialString();
void SetLedSequencePositions(std::vector<unsigned int> positions); void SetLedSequencePositions(std::vector<unsigned int> positions);
void SetMode(std::vector<mode> modes, int active_mode, std::vector<RGBColor> colors); void SetMode(std::vector<mode> modes, int active_mode, std::vector<RGBColor> colors);
@ -106,6 +106,7 @@ protected:
private: private:
std::string location; std::string location;
std::string name;
std::string version; std::string version;
std::vector<unsigned int> led_sequence_positions; std::vector<unsigned int> led_sequence_positions;

4
Controllers/KeychronKeyboardController/KeychronKeyboardControllerDetect.cpp
View file

@ -29,9 +29,9 @@ void DetectKeychronKeyboardControllers(hid_device_info* info, const std::string&
if(dev) if(dev)
{ {
KeychronKeyboardController* controller = new KeychronKeyboardController(dev, *info); KeychronKeyboardController* controller = new KeychronKeyboardController(dev, *info, name);
RGBController_KeychronKeyboard* rgb_controller = new RGBController_KeychronKeyboard(controller); RGBController_KeychronKeyboard* rgb_controller = new RGBController_KeychronKeyboard(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller); ResourceManager::get()->RegisterRGBController(rgb_controller);
} }
} }

4
Controllers/KeychronKeyboardController/RGBController_KeychronKeyboard.cpp
View file

@ -430,13 +430,13 @@ typedef struct
RGBController_KeychronKeyboard::RGBController_KeychronKeyboard(KeychronKeyboardController* controller_ptr) RGBController_KeychronKeyboard::RGBController_KeychronKeyboard(KeychronKeyboardController* controller_ptr)
{ {
controller = controller_ptr; controller = controller_ptr;
name = "Keychron Keyboard";
name = controller->GetNameString();
vendor = "Keychron"; vendor = "Keychron";
type = DEVICE_TYPE_KEYBOARD; type = DEVICE_TYPE_KEYBOARD;
description = name; description = name;
location = controller->GetDeviceLocation(); location = controller->GetDeviceLocation();
serial = controller->GetSerialString(); serial = controller->GetSerialString();
version = controller->GetFirmwareVersion();
mode Custom; mode Custom;
Custom.name = "Custom"; Custom.name = "Custom";