diff --git a/Controllers/DasKeyboardController/DasKeyboardController.cpp b/Controllers/DasKeyboardController/DasKeyboardController.cpp index 929bbba4..a176f634 100644 --- a/Controllers/DasKeyboardController/DasKeyboardController.cpp +++ b/Controllers/DasKeyboardController/DasKeyboardController.cpp @@ -66,17 +66,17 @@ std::string DasKeyboardController::GetVersionString() std::string DasKeyboardController::GetLayoutString() { - /*-----------------------------------------------------*\ - | Experimental for now; should be '16' for US and '28' | - | for EU layout | - \*-----------------------------------------------------*/ + /*-----------------------------------------------------------*\ + | Experimental for now; should be '16 or 63' for US and '28' | + | for EU layout | + \*-----------------------------------------------------------*/ if(version.length() < 17) { return("NONE"); } std::string layout_id = version.substr(3, 2); - if(layout_id == "16") + if(layout_id == "16" || layout_id == "63") { return("US"); } diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp index 4586ff0b..4c427353 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp +++ b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp @@ -17,10 +17,10 @@ using namespace std::chrono_literals; //0xFFFFFFFF indicates an unused entry in matrix #define NA 0xFFFFFFFF -// US Layout TODO: mus be checked/corrected +// US Layout static unsigned int matrix_map_us[7][21] = { - {NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 126, NA, NA, NA}, + {NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA}, { 5, NA, 17, 23, 29, 35, 41, 47, 53, 59, 65, 71, 77, 83, 89, 95, 101, 127, 128, 129, 130}, { 4, 10, 16, 22, 28, 34, 40, 46, 52, 58, 64, 70, 76, 82, 88, 94, 100, 106, 112, 118, 124}, { 3, 9, 15, 21, 27, 33, 39, 45, 51, 57, 63, 69, 75, 7, 87, 93, 99, 105, 111, 117, 123},