mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-05-18 11:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Store name in CoolerMasterControllers to avoid setting it in detectors

Browse Source
This commit is contained in:
Adam Honse
2025-08-15 16:16:06 -05:00
parent ddc8bc5885
commit 5db766cfa0
16 changed files with 78 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp
View File

@@ -12,20 +12,20 @@
#include "CMKeyboardAbstractController.h"
#include "StringUtils.h"
CMKeyboardAbstractController::CMKeyboardAbstractController(hid_device* dev_handle, hid_device_info* dev_info)
CMKeyboardAbstractController::CMKeyboardAbstractController(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name)
{
wchar_t tmp[HID_MAX_STR];
m_pDev = dev_handle;
m_productId = dev_info->product_id;
m_sLocation = dev_info->path;
m_deviceName = dev_name;
hid_get_manufacturer_string(m_pDev, tmp, HID_MAX_STR);
m_vendorName = StringUtils::wstring_to_string(tmp);
hid_get_product_string(m_pDev, tmp, HID_MAX_STR);
m_deviceName = StringUtils::wstring_to_string(tmp);
m_serialNumber = m_deviceName;
m_serialNumber = StringUtils::wstring_to_string(tmp);
bool bNotFound = true;
@@ -55,11 +55,6 @@ std::string CMKeyboardAbstractController::GetDeviceName()
return(m_deviceName);
}
void CMKeyboardAbstractController::SetDeviceName(std::string name)
{
m_deviceName = name;
}
std::string CMKeyboardAbstractController::GetDeviceVendor()
{
return(m_vendorName);

3
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h
View File

@@ -56,7 +56,7 @@ enum cm_keyboard_control_mode
class CMKeyboardAbstractController
{
public:
CMKeyboardAbstractController(hid_device* dev_handle, hid_device_info* dev_info);
CMKeyboardAbstractController(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name);
virtual ~CMKeyboardAbstractController();
/*---------------------------------------------------------*\
@@ -64,7 +64,6 @@ public:
\*---------------------------------------------------------*/
int GetProductID();
std::string GetDeviceName();
void SetDeviceName(std::string name);
std::string GetDeviceVendor();
std::string GetDeviceSerial();
std::string GetLocation();

2
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp
View File

@@ -13,7 +13,7 @@
#include "CMKeyboardV1Controller.h"
#include "LogManager.h"
CMKeyboardV1Controller::CMKeyboardV1Controller(hid_device* dev_handle, hid_device_info* dev_info) : CMKeyboardAbstractController(dev_handle, dev_info)
CMKeyboardV1Controller::CMKeyboardV1Controller(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name) : CMKeyboardAbstractController(dev_handle, dev_info, dev_name)
{
m_sFirmwareVersion = _GetFirmwareVersion();
}

2
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h
View File

@@ -16,7 +16,7 @@
class CMKeyboardV1Controller : public CMKeyboardAbstractController
{
public:
CMKeyboardV1Controller(hid_device* dev_handle, hid_device_info* dev_info);
CMKeyboardV1Controller(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name);
~CMKeyboardV1Controller();
/*---------------------------------------------------------*\

2
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp
View File

@@ -16,7 +16,7 @@
#include "LogManager.h"
#include "StringUtils.h"
CMKeyboardV2Controller::CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info) : CMKeyboardAbstractController(dev_handle, dev_info)
CMKeyboardV2Controller::CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name) : CMKeyboardAbstractController(dev_handle, dev_info, dev_name)
{
m_sFirmwareVersion = _GetFirmwareVersion();
m_bMoreFFs = false;

2
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h
View File

@@ -30,7 +30,7 @@ struct stCMKeyboardV2_mode
class CMKeyboardV2Controller : public CMKeyboardAbstractController
{
public:
CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info);
CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name);
~CMKeyboardV2Controller();
/*---------------------------------------------------------*\