diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp index ed3fc774..c4e19a08 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp @@ -12,7 +12,7 @@ #include // Skip these indices in the color output -static unsigned int skip_idx[] = { 6, 23, 29, 41, 47, 59, 70, 71, 75, 76, 87, 88, 93, 99, 100, 102, 108, 113, 114, 120, 123, 124 }; +static unsigned int skip_idx[] = { 23, 29, 41, 47, 59, 70, 71, 76, 87, 88, 93, 99, 100, 102, 108, 113, 114, 120, 123, 124 }; HyperXAlloyOriginsController::HyperXAlloyOriginsController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp index 7a6cff98..f7f5547b 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp @@ -15,12 +15,12 @@ using namespace std::chrono_literals; #define NA 0xFFFFFFFF static unsigned int matrix_map[6][23] = - { { 0, NA, 11, 17, 22, 27, NA, 33, 38, 43, 49, NA, 54, 60, 64, 68, 74, 78, 83, NA, NA, NA, NA }, - { 1, 6, 12, 18, 23, 28, 34, 39, 44, 50, 55, NA, 61, 65, 69, NA, 75, 79, 84, 87, 92, 96, 101 }, - { 2, NA, 7, 13, 19, 24, NA, 29, 35, 40, 45, 51, 56, 62, 66, 70, 76, 80, 85, 88, 93, 97, 102 }, - { 3, NA, 8, 14, 20, 25, NA, 30, 36, 41, 46, 52, 57, 63, 71, NA, NA, NA, NA, 89, 94, 98, NA }, - { 4, NA, 9, 15, 21, 26, NA, 31, NA, 37, 42, 47, 53, 58, 72, NA, NA, 81, NA, 90, 95, 99, 103 }, - { 5, 10, 16, NA, NA, NA, NA, 32, NA, NA, NA, NA, 48, 59, 67, 73, 77, 82, 86, 91, NA, 100, NA } }; + { { 0, NA, 12, 18, 23, 28, NA, 34, 39, 44, 50, NA, 55, 61, 65, 70, 76, 80, 85, NA, NA, NA, NA }, + { 1, 7, 13, 19, 24, 29, 35, 40, 45, 51, 56, NA, 62, 66, 71, NA, 77, 81, 86, 89, 94, 98, 103 }, + { 2, NA, 8, 14, 20, 25, NA, 30, 36, 41, 46, 52, 57, 63, 67, 72, 78, 82, 87, 90, 95, 99, 104 }, + { 3, NA, 9, 15, 21, 26, NA, 31, 37, 42, 47, 53, 58, 64, 68, 73, NA, NA, NA, 91, 96, 100, NA }, + { 4, 6, 10, 16, 22, 27, NA, 32, NA, 38, 43, 48, 54, 59, 74, NA, NA, 83, NA, 92, 97, 101, 105 }, + { 5, 11, 17, NA, NA, NA, NA, 33, NA, NA, NA, NA, 49, 60, 69, 75, 79, 84, 88, 93, NA, 102, NA } }; static const char* zone_names[] = { @@ -34,7 +34,7 @@ static zone_type zone_types[] = static const unsigned int zone_sizes[] = { - 104, + 106, }; static const char *led_names[] = @@ -45,7 +45,7 @@ static const char *led_names[] = "Key: Caps Lock", "Key: Left Shift", "Key: Left Control", - // Skip index 6 + "Key: \\ (ISO)", "Key: 1", "Key: Q", "Key: A", @@ -114,7 +114,7 @@ static const char *led_names[] = "Key: F11", "Key: =", "Key: ]", - // Skip index 75 + "Key: #", // Skip index 76 "Key: Menu", "Key: F12", @@ -164,7 +164,7 @@ static const char *led_names[] = "Key: Number Pad +", // Skip index 123 // Skip index 124 - "Key: Number Pad Enter", + "Key: Number Pad Enter", }; RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOriginsController* hyperx_ptr)