diff --git a/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp b/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp index 6a7835b3..df28be4a 100644 --- a/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp @@ -14,13 +14,14 @@ using namespace std::chrono_literals; static unsigned int keys[] = {0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, - 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x20, 0x21, 0x22, 0x23, 0x24, - 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, - 0x33, 0x34, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3E, 0x3F, 0x41, 0x44, 0x45, - 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x51, 0x54, 0x55, 0x58, 0x59, - 0x5A, 0x5B, 0x5C, 0x5E, 0x5F, 0x61, 0x64, 0x65, 0x68, 0x69, 0x6A, 0x6B, 0x6C, - 0x6E, 0x6F, 0x74, 0x75, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x81, - 0x84, 0x85, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x91, 0x94, 0x95 }; + 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x20, 0x21, 0x22, + 0x23, 0x24, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3E, 0x3F, 0x41, + 0x44, 0x45, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x51, 0x54, 0x55, + 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5E, 0x5F, 0x61, 0x64, 0x65, 0x68, 0x69, 0x6A, + 0x6B, 0x6C, 0x6E, 0x6F, 0x74, 0x75, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, + 0x7F, 0x81, 0x84, 0x85, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x91, + 0x94, 0x95 }; static unsigned int extended_red[] = {0x08, 0x48, 0x88, 0x09, 0x89, 0x0A, 0x8A, 0x0B, 0x8B, 0x0C, 0x8C, 0x0D, 0x8D, 0x0E, 0x8F, 0x8E, 0x0F, 0x4F, 0x92, 0x13, 0x93, 0x12 }; static unsigned int extended_grn[] = {0x29, 0x28, 0x78, 0x19, 0x79, 0x1A, 0x7A, 0x1B, 0x7B, 0x1C, 0x7C, 0x1D, 0x7D, 0x1E, 0x6E, 0x7E, 0x1F, 0x6F, 0x82, 0x23, 0x83, 0x22 }; @@ -116,9 +117,9 @@ void HyperXKeyboardController::SetLEDsDirect(std::vector colors) for(std::size_t i = 0; i < 22; i++) { - ext_color_data[extended_red[i]] = RGBGetRValue(colors[i + 104]); - ext_color_data[extended_grn[i]] = RGBGetGValue(colors[i + 104]); - ext_color_data[extended_blu[i]] = RGBGetBValue(colors[i + 104]); + ext_color_data[extended_red[i]] = RGBGetRValue(colors[i + 106]); + ext_color_data[extended_grn[i]] = RGBGetGValue(colors[i + 106]); + ext_color_data[extended_blu[i]] = RGBGetBValue(colors[i + 106]); } SendDirect @@ -167,9 +168,9 @@ void HyperXKeyboardController::SetLEDs(std::vector colors) for(std::size_t i = 0; i < 22; i++) { - ext_color_data[extended_red[i]] = RGBGetRValue(colors[i + 104]); - ext_color_data[extended_grn[i]] = RGBGetGValue(colors[i + 104]); - ext_color_data[extended_blu[i]] = RGBGetBValue(colors[i + 104]); + ext_color_data[extended_red[i]] = RGBGetRValue(colors[i + 106]); + ext_color_data[extended_grn[i]] = RGBGetGValue(colors[i + 106]); + ext_color_data[extended_blu[i]] = RGBGetBValue(colors[i + 106]); } SendColor diff --git a/RGBController/RGBController_HyperXKeyboard.cpp b/RGBController/RGBController_HyperXKeyboard.cpp index a021592f..5030ba1e 100644 --- a/RGBController/RGBController_HyperXKeyboard.cpp +++ b/RGBController/RGBController_HyperXKeyboard.cpp @@ -42,9 +42,9 @@ static unsigned int matrix_map[6][23] = { { 0, NA, 16, 30, 44, 54, NA, 65, 75, 84, 95, NA, 8, 23 , 38, 6 , 22, 36, 49, NA, NA, NA, NA }, { 1, 17, 31, 45, 55, 66, 76, 85, 96, 9, 24, NA, 39, 7 , 37, NA , 60, 70, 80, 52, 63, 73, 82 }, { 2, NA, 18, 32, 46, 56, NA, 67, 77, 86, 97, 10, 25, 40 , 90, 101, 50, 61, 71, 51, 62, 72, 93 }, - { 3, NA, 19, 33, 47, 57, NA, 68, 78, 87, 98, 11, 26, 41 , 28, 21 , NA, NA, NA, 92, 103, 53, NA }, - { 4, 14, 34, 48, 58, 69, NA, 79, NA, 88, 99, 12, 27, 42 , 81, NA , NA, 102, NA, 64, 74, 83, 104 }, - { 5, 20, 35, NA, NA, NA, NA, 59, NA, NA, NA, NA, 89, 100, 13, 91 , 15, 29, 43, 94, NA, 105, NA } }; + { 3, NA, 19, 33, 47, 57, NA, 68, 78, 87, 98, 11, 26, 41 , 28, 14 , NA, NA, NA, 92, 103, 53, NA }, + { 4, 20, 34, 48, 58, 69, NA, 79, NA, 88, 99, 12, 27, 42 , 81, NA , NA, 102, NA, 64, 74, 83, 104 }, + { 5, 21, 35, NA, NA, NA, NA, 59, NA, NA, NA, NA, 89, 100, 13, 91 , 15, 29, 43, 94, NA, 105, NA } }; static const char* zone_names[] = { @@ -68,135 +68,136 @@ static const unsigned int zone_sizes[] = }; static const char *led_names[] = - { - "Key: Escape", - "Key: `", - "Key: Tab", - "Key: Caps Lock", - "Key: Left Shift", - "Key: Left Control", - "Key: F12", - "Key: =", - "Key: F9", - "Key: 9", - "Key: O", - "Key: L", - "Key: ,", - "Key: Context", - "Key: UK Enter", - "Key: Left Arrow", - "Key: F1", - "Key: 1", - "Key: Q", - "Key: A", - "Key: UK Backslash", - "Key: Left Windows", - "Key: Print Screen", - "Key: F10", - "Key: 0", - "Key: P", - "Key: ;", - "Key: .", - "Key: Enter", - "Key: Down Arrow", - "Key: F2", - "Key: 2", - "Key: W", - "Key: S", - "Key: Z", - "Key: Left Alt", - "Key: Scroll Lock", - "Key: Backspace", - "Key: F11", - "Key: -", - "Key: [", - "Key: '", - "Key: /", - "Key: Right Arrow", - "Key: F3", - "Key: 3", - "Key: E", - "Key: D", - "Key: X", - "Key: Pause/Break", - "Key: Delete", - "Key: Number Pad 7", - "Key: Num Lock", - "Key: Number Pad 6", - "Key: F4", - "Key: 4", - "Key: R", - "Key: F", - "Key: C", - "Key: Space", - "Key: Insert", - "Key: End", - "Key: Number Pad 8", - "Key: Number Pad /", - "Key: Number Pad 1", - "Key: F5", - "Key: 5", - "Key: T", - "Key: G", - "Key: V", - "Key: Home", - "Key: Page Down", - "Key: Number Pad 9", - "Key: Number Pad *", - "Key: Number Pad 2", - "Key: F6", - "Key: 6", - "Key: Y", - "Key: H", - "Key: B", - "Key: Page Up", - "Key: Right Shift", - "Key: Number Pad -", - "Key: Number Pad 3", - "Key: F7", - "Key: 7", - "Key: U", - "Key: J", - "Key: N", - "Key: Right Alt", - "Key: ]", - "Key: Right Control", - "Key: Number Pad 4", - "Key: Number Pad +", - "Key: Number Pad 0", - "Key: F8", - "Key: 8", - "Key: I", - "Key: K", - "Key: M", - "Key: Right Windows", - "Key: \\", - "Key: Up Arrow", - "Key: Number Pad 5", - "Key: Number Pad Enter", - "Key: Number Pad .", - "RGB Strip 1", - "RGB Strip 2", - "RGB Strip 3", - "RGB Strip 4", - "RGB Strip 5", - "RGB Strip 6", - "RGB Strip 7", - "RGB Strip 8", - "RGB Strip 9", - "RGB Strip 10", - "RGB Strip 11", - "RGB Strip 12", - "RGB Strip 13", - "RGB Strip 14", - "RGB Strip 15", - "RGB Strip 16", - "RGB Strip 17", - "RGB Strip 18", - "Media Previous", - "Media Play/Pause", - "Media Next", - "Media Mute"}; +{ + "Key: Escape", + "Key: `", + "Key: Tab", + "Key: Caps Lock", + "Key: Left Shift", + "Key: Left Control", + "Key: F12", + "Key: =", + "Key: F9", + "Key: 9", + "Key: O", + "Key: L", + "Key: ,", + "Key: Context", + "Key: UK Enter", + "Key: Left Arrow", + "Key: F1", + "Key: 1", + "Key: Q", + "Key: A", + "Key: UK Backslash", + "Key: Left Windows", + "Key: Print Screen", + "Key: F10", + "Key: 0", + "Key: P", + "Key: ;", + "Key: .", + "Key: Enter", + "Key: Down Arrow", + "Key: F2", + "Key: 2", + "Key: W", + "Key: S", + "Key: Z", + "Key: Left Alt", + "Key: Scroll Lock", + "Key: Backspace", + "Key: F11", + "Key: -", + "Key: [", + "Key: '", + "Key: /", + "Key: Right Arrow", + "Key: F3", + "Key: 3", + "Key: E", + "Key: D", + "Key: X", + "Key: Pause/Break", + "Key: Delete", + "Key: Number Pad 7", + "Key: Num Lock", + "Key: Number Pad 6", + "Key: F4", + "Key: 4", + "Key: R", + "Key: F", + "Key: C", + "Key: Space", + "Key: Insert", + "Key: End", + "Key: Number Pad 8", + "Key: Number Pad /", + "Key: Number Pad 1", + "Key: F5", + "Key: 5", + "Key: T", + "Key: G", + "Key: V", + "Key: Home", + "Key: Page Down", + "Key: Number Pad 9", + "Key: Number Pad *", + "Key: Number Pad 2", + "Key: F6", + "Key: 6", + "Key: Y", + "Key: H", + "Key: B", + "Key: Page Up", + "Key: Right Shift", + "Key: Number Pad -", + "Key: Number Pad 3", + "Key: F7", + "Key: 7", + "Key: U", + "Key: J", + "Key: N", + "Key: Right Alt", + "Key: ]", + "Key: Right Control", + "Key: Number Pad 4", + "Key: Number Pad +", + "Key: Number Pad 0", + "Key: F8", + "Key: 8", + "Key: I", + "Key: K", + "Key: M", + "Key: Right Windows", + "Key: \\", + "Key: Up Arrow", + "Key: Number Pad 5", + "Key: Number Pad Enter", + "Key: Number Pad .", + "RGB Strip 1", + "RGB Strip 2", + "RGB Strip 3", + "RGB Strip 4", + "RGB Strip 5", + "RGB Strip 6", + "RGB Strip 7", + "RGB Strip 8", + "RGB Strip 9", + "RGB Strip 10", + "RGB Strip 11", + "RGB Strip 12", + "RGB Strip 13", + "RGB Strip 14", + "RGB Strip 15", + "RGB Strip 16", + "RGB Strip 17", + "RGB Strip 18", + "Media Previous", + "Media Play/Pause", + "Media Next", + "Media Mute" +}; RGBController_HyperXKeyboard::RGBController_HyperXKeyboard(HyperXKeyboardController* hyperx_ptr) {