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

Fix serial numbers from buggy ASUS keyboard firmwares

Browse source 
* ASUS firmware bugs sometimes return trailing garbage after the serial number. This new algorithm cleans up the garbage by only allowing legal, lower-ASCII characters, so that OpenRGB can accurately identify keyboards that have buggy firmwares.
This commit is contained in:
Arcitec 2023-08-23 21:13:06 +02:00
parent 21092ef7e0
commit b452110b43
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp
View file

@ -37,6 +37,26 @@ std::string AuraTUFKeyboardController::GetDeviceLocation()
return("HID: " + location);
}
std::string clean_serial(const std::wstring& wstr)
{
// Skip non-ASCII, trailing garbage in serial numbers. Required by the
// Scope II 96, whose original firmware outputs garbage, which even differs
// after computer reboots and therefore breaks OpenRGB profile matching.
std::string result;
for(auto c : wstr)
{
// Forbid control chars and anything above final printable low-ASCII.
if(c < 32 || c > 126)
{
break;
}
result += c;
}
return(result);
}
std::string AuraTUFKeyboardController::GetSerialString()
{
wchar_t serial_string[128];
@ -47,8 +67,8 @@ std::string AuraTUFKeyboardController::GetSerialString()
return("");
}
std::wstring return_wstring = serial_string;
std::string return_string(return_wstring.begin(), return_wstring.end());
std::wstring serial_wstring = serial_string;
std::string return_string = clean_serial(serial_wstring);
return(return_string);
}