Das Keyboard 4Q Fix-up

Commits squashed and amended for code style by Adam Honse <calcprogrammer1@gmail.com>
This commit is contained in:
denk_mal 2021-01-26 09:29:33 +01:00 committed by Adam Honse
parent 6ca1c1af35
commit 582afad557
4 changed files with 80 additions and 27 deletions

View file

@ -36,12 +36,39 @@ std::string DasKeyboardController::GetSerialString()
std::wstring return_wstring = serial_string;
std::string return_string(return_wstring.begin(), return_wstring.end());
if(return_string.empty())
{
return_string = version;
}
return return_string;
}
std::string DasKeyboardController::GetVersionString()
{
return version;
std::string fw_version = "V";
fw_version += version.substr(6, 2);
fw_version += ".";
fw_version += version.substr(15, 2);
fw_version += ".0";
return fw_version;
}
std::string DasKeyboardController::GetLayoutString()
{
/*-----------------------------------------------------*\
| Experimental for now; should be '16' for US and '28' |
| for EU layout |
\*-----------------------------------------------------*/
std::string layout_id = version.substr(3, 2);
if (layout_id == "16")
{
return "US";
}
return "EU";
}
void DasKeyboardController::SendColors(unsigned char key_id, unsigned char mode,