From d8e023b4c8e93b3024941ba36058103154f309c7 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 26 Jan 2022 11:28:26 +1100 Subject: [PATCH] Initial commit for a canonical list of key names + Created RGBControllerKeyNames.h * Adjusted every reference for key names found in `DeviceView` * Formatting corrections --- .../RGBController_AlienwareAW510K.cpp | 211 +- .../RGBController_AnnePro2.cpp | 123 +- .../AsusAuraTUFKeyboardLayouts.h | 545 +-- .../RGBController_AsusAuraKeyboard.cpp | 529 +- .../RGBController_CorsairK100.cpp | 225 +- .../RGBController_CorsairPeripheral.cpp | 915 ++-- .../RGBController_CorsairWireless.cpp | 255 +- .../RGBController_DasKeyboard.cpp | 257 +- .../DebugController/DebugControllerDetect.cpp | 239 +- .../RGBController_DuckyKeyboard.cpp | 263 +- .../RGBController_DygmaRaise.cpp | 145 +- .../RGBController_HyperXAlloyElite.cpp | 221 +- .../RGBController_HyperXAlloyElite2.cpp | 221 +- .../RGBController_HyperXAlloyFPS.cpp | 213 +- .../RGBController_HyperXAlloyOrigins.cpp | 213 +- .../RGBController_HyperXAlloyOriginsCore.cpp | 175 +- .../RGBController_LogitechG810.cpp | 223 +- .../RGBController_LogitechG815.cpp | 221 +- .../RGBController_LogitechG910.cpp | 213 +- .../RGBController_LogitechG915.cpp | 221 +- .../RGBController_LogitechGProKeyboard.cpp | 179 +- .../OpenRazerController/OpenRazerDevices.h | 2397 ++++----- .../QMKOpenRGBRev9Controller.cpp | 94 +- .../QMKOpenRGBRevBController.cpp | 96 +- .../QMKOpenRGBRevDController.cpp | 94 +- Controllers/RazerController/RazerDevices.h | 4347 +++++++++-------- .../RGBController_RoccatVulcanAimo.cpp | 247 +- .../RGBController_SinowealthKeyboard.cpp | 173 +- .../RGBController_SinowealthKeyboard16.cpp | 264 +- .../RGBController_SteelSeriesApex.cpp | 211 +- .../RGBController_ThermaltakePoseidonZRGB.cpp | 209 +- .../RGBController_WootingKeyboard.cpp | 243 +- .../RGBController_ZETBladeOptical.cpp | 209 +- OpenRGB.pro | 1 + RGBController/RGBControllerKeyNames.h | 138 + qt/DeviceView.cpp | 251 +- 36 files changed, 7479 insertions(+), 7302 deletions(-) create mode 100644 RGBController/RGBControllerKeyNames.h diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp index 23dcf031..f3fad060 100644 --- a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp +++ b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp @@ -7,6 +7,7 @@ | Mohamad Sallal - msallal 05/22/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_AlienwareAW510K.h" #include @@ -49,111 +50,111 @@ typedef struct static const led_type led_names[] = { /* Key Label Zone, Index */ - { "Key: Escape", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB0 }, - { "Key: F1", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x98 }, - { "Key: F2", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x90 }, - { "Key: F3", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x88 }, - { "Key: F4", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x80 }, - { "Key: F5", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x70 }, - { "Key: F6", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x68 }, - { "Key: F7", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x60 }, - { "Key: F8", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x58 }, - { "Key: F9", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x50 }, - { "Key: F10", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x48 }, - { "Key: F11", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x40 }, - { "Key: F12", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x38 }, - { "Key: Print Screen", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x30 }, - { "Key: Scroll Lock", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x28 }, - { "Key: Pause/Break", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x20 }, - { "Key: Media Mute", ALIENWARE_AW510K_ZONE_DIRECT_MEDIA, 0x18 }, - { "Key: `", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB1 }, - { "Key: 1", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA1 }, - { "Key: 2", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x99 }, - { "Key: 3", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x91 }, - { "Key: 4", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x89 }, - { "Key: 5", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x81 }, - { "Key: 6", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x79 }, - { "Key: 7", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x71 }, - { "Key: 8", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x69 }, - { "Key: 9", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x61 }, - { "Key: 0", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x59 }, - { "Key: -", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x51 }, - { "Key: =", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x49 }, - { "Key: Backspace", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x39 }, - { "Key: Insert", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x31 }, - { "Key: Home", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x29 }, - { "Key: Page Up", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x21 }, - { "Key: Num Lock", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x19 }, - { "Key: Number Pad /", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x11 }, - { "Key: Number Pad *", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x09 }, - { "Key: Number Pad -", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x01 }, - { "Key: Tab", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB2 }, - { "Key: Q", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA2 }, - { "Key: W", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x9A }, - { "Key: E", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x92 }, - { "Key: R", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x8A }, - { "Key: T", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x82 }, - { "Key: Y", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x7A }, - { "Key: U", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x72 }, - { "Key: I", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x6A }, - { "Key: O", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x62 }, - { "Key: P", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5A }, - { "Key: [", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x52 }, - { "Key: ]", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x4A }, - { "Key: \\ (ANSI)", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x42 },//ANSI only - { "Key: Delete", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x32 }, - { "Key: End", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x2A }, - { "Key: Page Down", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x22 }, - { "Key: Number Pad 7", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1A }, - { "Key: Number Pad 8", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x12 }, - { "Key: Number Pad 9", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0A }, - { "Key: Caps Lock", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB3 }, - { "Key: A", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA3 }, - { "Key: S", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x9B }, - { "Key: D", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x93 }, - { "Key: F", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x8B }, - { "Key: G", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x83 }, - { "Key: H", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x7B }, - { "Key: J", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x73 }, - { "Key: K", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x6B }, - { "Key: L", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x63 }, - { "Key: ;", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5B }, - { "Key: '", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x53 }, - { "Key: Enter", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x43 }, - { "Key: Number Pad 4", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1B }, - { "Key: Number Pad 5", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x13 }, - { "Key: Number Pad 6", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0B }, - { "Key: Number Pad +", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x03 }, - { "Key: Left Shift", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB4 }, - { "Key: Z", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA4 }, - { "Key: X", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x9C }, - { "Key: C", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x94 }, - { "Key: V", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x8C }, - { "Key: B", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x84 }, - { "Key: N", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x7C }, - { "Key: M", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x74 }, - { "Key: ,", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x6C }, - { "Key: .", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x64 }, - { "Key: /", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5C }, - { "Key: Right Shift", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x4C }, - { "Key: Up Arrow", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x2C }, - { "Key: Number Pad 1", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1C }, - { "Key: Number Pad 2", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x14 }, - { "Key: Number Pad 3", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0C }, - { "Key: Left Control", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB5 }, - { "Key: Left Windows", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xAD }, - { "Key: Left Alt", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA5 }, - { "Key: Space", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x85 }, - { "Key: Right Alt", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x65 }, - { "Key: Right Fn", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5D }, - { "Key: Menu", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x55 }, - { "Key: Right Control", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x4D }, - { "Key: Left Arrow", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x35 }, - { "Key: Down Arrow", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x2D }, - { "Key: Right Arrow", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x25 }, - { "Key: Number Pad 0", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1D }, - { "Key: Number Pad .", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0D }, - { "Key: Number Pad Enter", ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x05 }, + { KEY_EN_ESCAPE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB0 }, + { KEY_EN_F1, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x98 }, + { KEY_EN_F2, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x90 }, + { KEY_EN_F3, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x88 }, + { KEY_EN_F4, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x80 }, + { KEY_EN_F5, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x70 }, + { KEY_EN_F6, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x68 }, + { KEY_EN_F7, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x60 }, + { KEY_EN_F8, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x58 }, + { KEY_EN_F9, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x50 }, + { KEY_EN_F10, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x48 }, + { KEY_EN_F11, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x40 }, + { KEY_EN_F12, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x38 }, + { KEY_EN_PRINT_SCREEN, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x30 }, + { KEY_EN_SCROLL_LOCK, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x28 }, + { KEY_EN_PAUSE_BREAK, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x20 }, + { KEY_EN_MEDIA_MUTE, ALIENWARE_AW510K_ZONE_DIRECT_MEDIA, 0x18 }, + { KEY_EN_BACK_TICK, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB1 }, + { KEY_EN_1, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA1 }, + { KEY_EN_2, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x99 }, + { KEY_EN_3, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x91 }, + { KEY_EN_4, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x89 }, + { KEY_EN_5, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x81 }, + { KEY_EN_6, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x79 }, + { KEY_EN_7, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x71 }, + { KEY_EN_8, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x69 }, + { KEY_EN_9, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x61 }, + { KEY_EN_0, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x59 }, + { KEY_EN_MINUS, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x51 }, + { KEY_EN_EQUALS, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x49 }, + { KEY_EN_BACKSPACE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x39 }, + { KEY_EN_INSERT, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x31 }, + { KEY_EN_HOME, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x29 }, + { KEY_EN_PAGE_UP, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x21 }, + { KEY_EN_NUMPAD_LOCK, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x19 }, + { KEY_EN_NUMPAD_DIVIDE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x11 }, + { KEY_EN_NUMPAD_TIMES, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x09 }, + { KEY_EN_NUMPAD_MINUS, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x01 }, + { KEY_EN_TAB, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB2 }, + { KEY_EN_Q, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA2 }, + { KEY_EN_W, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x9A }, + { KEY_EN_E, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x92 }, + { KEY_EN_R, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x8A }, + { KEY_EN_T, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x82 }, + { KEY_EN_Y, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x7A }, + { KEY_EN_U, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x72 }, + { KEY_EN_I, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x6A }, + { KEY_EN_O, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x62 }, + { KEY_EN_P, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5A }, + { KEY_EN_LEFT_BRACKET, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x52 }, + { KEY_EN_RIGHT_BRACKET, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x4A }, + { KEY_EN_ANSI_BACK_SLASH, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x42 },//ANSI only + { KEY_EN_DELETE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x32 }, + { KEY_EN_END, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x2A }, + { KEY_EN_PAGE_DOWN, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x22 }, + { KEY_EN_NUMPAD_7, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1A }, + { KEY_EN_NUMPAD_8, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x12 }, + { KEY_EN_NUMPAD_9, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0A }, + { KEY_EN_CAPS_LOCK, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB3 }, + { KEY_EN_A, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA3 }, + { KEY_EN_S, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x9B }, + { KEY_EN_D, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x93 }, + { KEY_EN_F, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x8B }, + { KEY_EN_G, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x83 }, + { KEY_EN_H, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x7B }, + { KEY_EN_J, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x73 }, + { KEY_EN_K, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x6B }, + { KEY_EN_L, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x63 }, + { KEY_EN_SEMICOLON, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5B }, + { KEY_EN_QUOTE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x53 }, + { KEY_EN_ANSI_ENTER, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x43 }, + { KEY_EN_NUMPAD_4, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1B }, + { KEY_EN_NUMPAD_5, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x13 }, + { KEY_EN_NUMPAD_6, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0B }, + { KEY_EN_NUMPAD_PLUS, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x03 }, + { KEY_EN_LEFT_SHIFT, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB4 }, + { KEY_EN_Z, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA4 }, + { KEY_EN_X, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x9C }, + { KEY_EN_C, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x94 }, + { KEY_EN_V, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x8C }, + { KEY_EN_B, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x84 }, + { KEY_EN_N, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x7C }, + { KEY_EN_M, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x74 }, + { KEY_EN_COMMA, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x6C }, + { KEY_EN_PERIOD, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x64 }, + { KEY_EN_FORWARD_SLASH, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5C }, + { KEY_EN_RIGHT_SHIFT, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x4C }, + { KEY_EN_UP_ARROW, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x2C }, + { KEY_EN_NUMPAD_1, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1C }, + { KEY_EN_NUMPAD_2, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x14 }, + { KEY_EN_NUMPAD_3, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0C }, + { KEY_EN_LEFT_CONTROL, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB5 }, + { KEY_EN_LEFT_WINDOWS, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xAD }, + { KEY_EN_LEFT_ALT, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xA5 }, + { KEY_EN_SPACE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x85 }, + { KEY_EN_RIGHT_ALT, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x65 }, + { KEY_EN_RIGHT_FUNCTION, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x5D }, + { KEY_EN_MENU, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x55 }, + { KEY_EN_RIGHT_CONTROL, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x4D }, + { KEY_EN_LEFT_ARROW, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x35 }, + { KEY_EN_DOWN_ARROW, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x2D }, + { KEY_EN_RIGHT_ARROW, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x25 }, + { KEY_EN_NUMPAD_0, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x1D }, + { KEY_EN_NUMPAD_PERIOD, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x0D }, + { KEY_EN_NUMPAD_ENTER, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0x05 }, { "Logo", ALIENWARE_AW510K_ZONE_DIRECT_LOGO, 0x07 } }; diff --git a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp index 7d6d8ee0..4e83b7b5 100644 --- a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp +++ b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp @@ -7,6 +7,7 @@ | Sergey Gavrilov (DrZlo13) 06/06/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_AnnePro2.h" #define NA 0xFFFFFFFF @@ -44,67 +45,67 @@ typedef struct static const led_type led_names[] = { /* Key Label Index */ - { "Key: Escape", 0 }, - { "Key: 1", 1 }, - { "Key: 2", 2 }, - { "Key: 3", 3 }, - { "Key: 4", 4 }, - { "Key: 5", 5 }, - { "Key: 6", 6 }, - { "Key: 7", 7 }, - { "Key: 8", 8 }, - { "Key: 9", 9 }, - { "Key: 0", 10 }, - { "Key: -", 11 }, - { "Key: =", 12 }, - { "Key: Backspace", 13 }, - { "Key: Tab", 14 }, - { "Key: Q", 15 }, - { "Key: W", 16 }, - { "Key: E", 17 }, - { "Key: R", 18 }, - { "Key: T", 19 }, - { "Key: Y", 20 }, - { "Key: U", 21 }, - { "Key: I", 22 }, - { "Key: O", 23 }, - { "Key: P", 24 }, - { "Key: [", 25 }, - { "Key: ]", 26 }, - { "Key: \\ (ANSI)", 27 }, - { "Key: Caps Lock", 28 }, - { "Key: A", 29 }, - { "Key: S", 30 }, - { "Key: D", 31 }, - { "Key: F", 32 }, - { "Key: G", 33 }, - { "Key: H", 34 }, - { "Key: J", 35 }, - { "Key: K", 36 }, - { "Key: L", 37 }, - { "Key: ;", 38 }, - { "Key: '", 39 }, - { "Key: Enter", 40 }, - { "Key: Left Shift", 41 }, - { "Key: Z", 42 }, - { "Key: X", 43 }, - { "Key: C", 44 }, - { "Key: V", 45 }, - { "Key: B", 46 }, - { "Key: N", 47 }, - { "Key: M", 48 }, - { "Key: ,", 49 }, - { "Key: .", 50 }, - { "Key: /", 51 }, - { "Key: Right Shift", 52 }, - { "Key: Left Control", 53 }, - { "Key: Left Windows", 54 }, - { "Key: Left Alt", 55 }, - { "Key: Space", 56 }, - { "Key: Right Alt", 57 }, - { "Key: Right Fn", 58 }, - { "Key: Menu", 59 }, - { "Key: Right Control", 60 }, + { KEY_EN_ESCAPE, 0 }, + { KEY_EN_1, 1 }, + { KEY_EN_2, 2 }, + { KEY_EN_3, 3 }, + { KEY_EN_4, 4 }, + { KEY_EN_5, 5 }, + { KEY_EN_6, 6 }, + { KEY_EN_7, 7 }, + { KEY_EN_8, 8 }, + { KEY_EN_9, 9 }, + { KEY_EN_0, 10 }, + { KEY_EN_MINUS, 11 }, + { KEY_EN_EQUALS, 12 }, + { KEY_EN_BACKSPACE, 13 }, + { KEY_EN_TAB, 14 }, + { KEY_EN_Q, 15 }, + { KEY_EN_W, 16 }, + { KEY_EN_E, 17 }, + { KEY_EN_R, 18 }, + { KEY_EN_T, 19 }, + { KEY_EN_Y, 20 }, + { KEY_EN_U, 21 }, + { KEY_EN_I, 22 }, + { KEY_EN_O, 23 }, + { KEY_EN_P, 24 }, + { KEY_EN_LEFT_BRACKET, 25 }, + { KEY_EN_RIGHT_BRACKET, 26 }, + { KEY_EN_ANSI_BACK_SLASH, 27 }, + { KEY_EN_CAPS_LOCK, 28 }, + { KEY_EN_A, 29 }, + { KEY_EN_S, 30 }, + { KEY_EN_D, 31 }, + { KEY_EN_F, 32 }, + { KEY_EN_G, 33 }, + { KEY_EN_H, 34 }, + { KEY_EN_J, 35 }, + { KEY_EN_K, 36 }, + { KEY_EN_L, 37 }, + { KEY_EN_SEMICOLON, 38 }, + { KEY_EN_QUOTE, 39 }, + { KEY_EN_ANSI_ENTER, 40 }, + { KEY_EN_LEFT_SHIFT, 41 }, + { KEY_EN_Z, 42 }, + { KEY_EN_X, 43 }, + { KEY_EN_C, 44 }, + { KEY_EN_V, 45 }, + { KEY_EN_B, 46 }, + { KEY_EN_N, 47 }, + { KEY_EN_M, 48 }, + { KEY_EN_COMMA, 49 }, + { KEY_EN_PERIOD, 50 }, + { KEY_EN_FORWARD_SLASH, 51 }, + { KEY_EN_RIGHT_SHIFT, 52 }, + { KEY_EN_LEFT_CONTROL, 53 }, + { KEY_EN_LEFT_WINDOWS, 54 }, + { KEY_EN_LEFT_ALT, 55 }, + { KEY_EN_SPACE, 56 }, + { KEY_EN_RIGHT_ALT, 57 }, + { KEY_EN_RIGHT_FUNCTION, 58 }, + { KEY_EN_MENU, 59 }, + { KEY_EN_RIGHT_CONTROL, 60 }, }; RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_ptr) diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h index d8ac729b..18fdbe92 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h @@ -7,6 +7,7 @@ | Mola19 10/02/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include #include #include "RGBController.h" @@ -77,166 +78,166 @@ static std::map AsusTUFK7Layouts = { (unsigned int *) ASUS_TUF_K7_LAYOUT_KEYS_105, { - "Key: Escape", - "Key: `", - "Key: Tab", - "Key: Caps Lock", - "Key: Left Shift", - "Key: Left Control", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, - "Unused", - "Unused", - "Unused", - "Unused", + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, "Key: \\", - "Key: Left Windows", + KEY_EN_LEFT_WINDOWS, - "Unused", - "Key: 1", - "Key: Q", - "Key: A", - "Key: Z", - "Key: Left Alt", + KEY_EN_UNUSED, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_Z, + KEY_EN_LEFT_ALT, - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: X", - "Unused", + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_X, + KEY_EN_UNUSED, - "Key: F2", - "Key: 3", - "Key: E", - "Key: D", - "Key: C", - "Unused", + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_C, + KEY_EN_UNUSED, - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: V", - "Unused", + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_V, + KEY_EN_UNUSED, - "Key: F4", - "Key: 5", - "Key: T", - "Key: G", - "Key: B", - "Key: Space", + KEY_EN_F4, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_B, + KEY_EN_SPACE, - "Unused", - "Key: 6", - "Key: Y", - "Key: H", - "Key: N", - "Unused", + KEY_EN_UNUSED, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_N, + KEY_EN_UNUSED, - "Key: F5", - "Key: 7", - "Key: U", - "Key: J", - "Key: M", - "Unused", + KEY_EN_F5, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_M, + KEY_EN_UNUSED, - "Key: F6", - "Key: 8", - "Key: I", - "Key: K", - "Key: ,", - "Key: Right Alt", + KEY_EN_F6, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_COMMA, + KEY_EN_RIGHT_ALT, - "Key: F7", - "Key: 9", - "Key: O", - "Key: L", - "Key: .", - "Unused", + KEY_EN_F7, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_PERIOD, + KEY_EN_UNUSED, - "Key: F8", - "Key: 0", - "Key: P", - "Key: ;", - "Key: /", - "Key: Right Fn", + KEY_EN_F8, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_FUNCTION, - "Key: F9", - "Key: -", - "Key: [", - "Key: '", - "Unused", - "Key: Menu", + KEY_EN_F9, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_UNUSED, + KEY_EN_MENU, - "Key: F10", - "Key: =", - "Key: ]", - "Key: #", - "Unused", - "Unused", + KEY_EN_F10, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_POUND, + KEY_EN_UNUSED, + KEY_EN_UNUSED, - "Key: F11", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", + KEY_EN_F11, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, - "Key: F12", - "Key: Backspace", - "Unused", - "Key: Enter", - "Key: Right Shift", - "Key: Right Control", + KEY_EN_F12, + KEY_EN_BACKSPACE, + KEY_EN_UNUSED, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_CONTROL, - "Key: Print Screen", - "Key: Insert", - "Key: Delete", - "Unused", - "Unused", - "Key: Left Arrow", + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_ARROW, - "Key: Scroll Lock", - "Key: Home", - "Key: End", - "Unused", - "Key: Up Arrow", - "Key: Down Arrow", + KEY_EN_SCROLL_LOCK, + KEY_EN_HOME, + KEY_EN_END, + KEY_EN_UNUSED, + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, - "Key: Pause/Break", - "Key: Page Up", - "Key: Page Down", - "Unused", - "Unused", - "Key: Right Arrow", + KEY_EN_PAUSE_BREAK, + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_ARROW, - "Unused", - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Key: Number Pad 0", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_0, - "Unused", - "Key: Number Pad /", - "Key: Number Pad 8", - "Key: Number Pad 5", - "Key: Number Pad 2", - "Unused", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, + KEY_EN_UNUSED, - "Unused", - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, "Key: Number Pad ,", - "Unused", - "Key: Number Pad -", - "Key: Number Pad +", - "Unused", - "Key: Number Pad Enter", - "Unused", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_ENTER, + KEY_EN_UNUSED, } } }, @@ -245,166 +246,166 @@ static std::map AsusTUFK7Layouts = { (unsigned int *) ASUS_TUF_K7_LAYOUT_KEYS_104, { - "Key: Escape", - "Key: `", - "Key: Tab", - "Key: Caps Lock", - "Key: Left Shift", - "Key: Left Control", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Key: Left Windows", + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_WINDOWS, - "Unused", - "Key: 1", - "Key: Q", - "Key: A", - "Key: Z", - "Key: Left Alt", + KEY_EN_UNUSED, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_Z, + KEY_EN_LEFT_ALT, - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: X", - "Unused", + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_X, + KEY_EN_UNUSED, - "Key: F2", - "Key: 3", - "Key: E", - "Key: D", - "Key: C", - "Unused", + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_C, + KEY_EN_UNUSED, - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: V", - "Unused", + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_V, + KEY_EN_UNUSED, - "Key: F4", - "Key: 5", - "Key: T", - "Key: G", - "Key: B", - "Key: Space", + KEY_EN_F4, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_B, + KEY_EN_SPACE, - "Unused", - "Key: 6", - "Key: Y", - "Key: H", - "Key: N", - "Unused", + KEY_EN_UNUSED, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_N, + KEY_EN_UNUSED, - "Key: F5", - "Key: 7", - "Key: U", - "Key: J", - "Key: M", - "Unused", + KEY_EN_F5, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_M, + KEY_EN_UNUSED, - "Key: F6", - "Key: 8", - "Key: I", - "Key: K", - "Key: ,", - "Key: Right Alt", + KEY_EN_F6, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_COMMA, + KEY_EN_RIGHT_ALT, - "Key: F7", - "Key: 9", - "Key: O", - "Key: L", - "Key: .", - "Unused", + KEY_EN_F7, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_PERIOD, + KEY_EN_UNUSED, - "Key: F8", - "Key: 0", - "Key: P", - "Key: ;", - "Key: /", - "Key: Right Fn", + KEY_EN_F8, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_FUNCTION, - "Key: F9", - "Key: -", - "Key: [", - "Key: '", - "Unused", - "Key: Menu", + KEY_EN_F9, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_UNUSED, + KEY_EN_MENU, - "Key: F10", - "Key: =", - "Key: ]", - "Unused", - "Unused", - "Unused", + KEY_EN_F10, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, - "Key: F11", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", + KEY_EN_F11, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, - "Key: F12", - "Key: Backspace", + KEY_EN_F12, + KEY_EN_BACKSPACE, "Key: \\", - "Key: Enter", - "Key: Right Shift", - "Key: Right Control", + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_CONTROL, - "Key: Print Screen", - "Key: Insert", - "Key: Delete", - "Unused", - "Unused", - "Key: Left Arrow", + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_ARROW, - "Key: Scroll Lock", - "Key: Home", - "Key: End", - "Unused", - "Key: Up Arrow", - "Key: Down Arrow", + KEY_EN_SCROLL_LOCK, + KEY_EN_HOME, + KEY_EN_END, + KEY_EN_UNUSED, + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, - "Key: Pause/Break", - "Key: Page Up", - "Key: Page Down", - "Unused", - "Unused", - "Key: Right Arrow", + KEY_EN_PAUSE_BREAK, + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_ARROW, - "Unused", - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Key: Number Pad 0", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_0, - "Unused", - "Key: Number Pad /", - "Key: Number Pad 8", - "Key: Number Pad 5", - "Key: Number Pad 2", - "Unused", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, + KEY_EN_UNUSED, - "Unused", - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, "Key: Number Pad ,", - "Unused", - "Key: Number Pad -", - "Key: Number Pad +", - "Unused", - "Key: Number Pad Enter", - "Unused", + KEY_EN_UNUSED, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_ENTER, + KEY_EN_UNUSED, } } }, diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp index bd8fda33..100fe1f3 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 3/19/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_AsusAuraKeyboard.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -46,199 +47,199 @@ static unsigned int falchion_matrix_map[5][16] = static const std::vector default_led_names = { /* Key Label Index */ - { "Key: Escape", 0x00 }, - { "Key: `", 0x01 }, - { "Key: Tab", 0x02 }, - { "Key: Caps Lock", 0x03 }, - { "Key: Left Shift", 0x04 }, - { "Key: Left Control", 0x05 }, - { "Key: \\ (ISO)", 0x0C }, - { "Key: 1", 0x11 }, - { "Key: Q", 0x12 }, - { "Key: A", 0x13 }, - { "Key: Z", 0x14 }, - { "Key: F1", 0x18 }, - { "Key: 2", 0x19 }, - { "Key: W", 0x1A }, - { "Key: S", 0x1B }, - { "Key: X", 0x1C }, - { "Key: F2", 0x20 }, - { "Key: 3", 0x21 }, - { "Key: E", 0x22 }, - { "Key: D", 0x23 }, - { "Key: C", 0x24 }, - { "Key: F3", 0x28 }, - { "Key: 4", 0x29 }, - { "Key: R", 0x2A }, - { "Key: F", 0x2B }, - { "Key: V", 0x2C }, - { "Key: F4", 0x30 }, - { "Key: 5", 0x31 }, - { "Key: T", 0x32 }, - { "Key: G", 0x33 }, - { "Key: B", 0x34 }, - { "Key: Space", 0x35 }, - { "Key: 6", 0x39 }, - { "Key: Y", 0x3A }, - { "Key: H", 0x3B }, - { "Key: N", 0x3C }, - { "Key: F5", 0x40 }, - { "Key: 7", 0x41 }, - { "Key: U", 0x42 }, - { "Key: J", 0x43 }, - { "Key: M", 0x44 }, - { "Key: F6", 0x48 }, - { "Key: 8", 0x49 }, - { "Key: I", 0x4A }, - { "Key: K", 0x4B }, - { "Key: ,", 0x4C }, - { "Key: Right Alt", 0x4D }, - { "Key: F7", 0x50 }, - { "Key: 9", 0x51 }, - { "Key: O", 0x52 }, - { "Key: L", 0x53 }, - { "Key: .", 0x54 }, - { "Key: F8", 0x58 }, - { "Key: 0", 0x59 }, - { "Key: P", 0x5A }, - { "Key: ;", 0x5B }, - { "Key: /", 0x5C }, - { "Key: Right Fn", 0x5D }, - { "Key: F9", 0x60 }, - { "Key: -", 0x61 }, - { "Key: [", 0x62 }, - { "Key: '", 0x63 }, - { "Key: Menu", 0x65 }, - { "Key: F10", 0x68 }, - { "Key: =", 0x69 }, - { "Key: ]", 0x6A }, - { "Key: #", 0x6B }, - { "Key: F11", 0x70 }, - { "Key: F12", 0x78 }, - { "Key: Backspace", 0x79 }, - { "Key: \\ (ANSI)", 0x7A }, - { "Key: Enter", 0x7B }, - { "Key: Right Shift", 0x7C }, - { "Key: Right Control", 0x7D }, - { "Key: Print Screen", 0x80 }, - { "Key: Insert", 0x81 }, - { "Key: Delete", 0x82 }, - { "Key: Left Arrow", 0x85 }, - { "Key: Scroll Lock", 0x88 }, - { "Key: Home", 0x89 }, - { "Key: End", 0x8A }, - { "Key: Up Arrow", 0x8C }, - { "Key: Down Arrow", 0x8D }, - { "Key: Pause/Break", 0x90 }, - { "Key: Page Up", 0x91 }, - { "Key: Page Down", 0x92 }, - { "Key: Right Arrow", 0x95 }, - { "Key: Num Lock", 0x99 }, - { "Key: Number Pad 7", 0x9A }, - { "Key: Number Pad 4", 0x9B }, - { "Key: Number Pad 1", 0x9C }, - { "Key: Number Pad 0", 0x9D }, - { "Key: Number Pad /", 0xA1 }, - { "Key: Number Pad 8", 0xA2 }, - { "Key: Number Pad 5", 0xA3 }, - { "Key: Number Pad 2", 0xA4 }, - { "Key: Number Pad *", 0xA9 }, - { "Key: Number Pad 9", 0xAA }, - { "Key: Number Pad 6", 0xAB }, - { "Key: Number Pad 3", 0xAC }, - { "Key: Number Pad .", 0xAD }, - { "Key: Number Pad -", 0xB1 }, - { "Key: Number Pad +", 0xB2 }, - { "Key: Number Pad Enter", 0xB4 }, + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_BACK_TICK, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + { KEY_EN_ISO_BACK_SLASH, 0x0C }, + { KEY_EN_1, 0x11 }, + { KEY_EN_Q, 0x12 }, + { KEY_EN_A, 0x13 }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_F1, 0x18 }, + { KEY_EN_2, 0x19 }, + { KEY_EN_W, 0x1A }, + { KEY_EN_S, 0x1B }, + { KEY_EN_X, 0x1C }, + { KEY_EN_F2, 0x20 }, + { KEY_EN_3, 0x21 }, + { KEY_EN_E, 0x22 }, + { KEY_EN_D, 0x23 }, + { KEY_EN_C, 0x24 }, + { KEY_EN_F3, 0x28 }, + { KEY_EN_4, 0x29 }, + { KEY_EN_R, 0x2A }, + { KEY_EN_F, 0x2B }, + { KEY_EN_V, 0x2C }, + { KEY_EN_F4, 0x30 }, + { KEY_EN_5, 0x31 }, + { KEY_EN_T, 0x32 }, + { KEY_EN_G, 0x33 }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + { KEY_EN_6, 0x39 }, + { KEY_EN_Y, 0x3A }, + { KEY_EN_H, 0x3B }, + { KEY_EN_N, 0x3C }, + { KEY_EN_F5, 0x40 }, + { KEY_EN_7, 0x41 }, + { KEY_EN_U, 0x42 }, + { KEY_EN_J, 0x43 }, + { KEY_EN_M, 0x44 }, + { KEY_EN_F6, 0x48 }, + { KEY_EN_8, 0x49 }, + { KEY_EN_I, 0x4A }, + { KEY_EN_K, 0x4B }, + { KEY_EN_COMMA, 0x4C }, + { KEY_EN_RIGHT_ALT, 0x4D }, + { KEY_EN_F7, 0x50 }, + { KEY_EN_9, 0x51 }, + { KEY_EN_O, 0x52 }, + { KEY_EN_L, 0x53 }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_F8, 0x58 }, + { KEY_EN_0, 0x59 }, + { KEY_EN_P, 0x5A }, + { KEY_EN_SEMICOLON, 0x5B }, + { KEY_EN_FORWARD_SLASH, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + { KEY_EN_F9, 0x60 }, + { KEY_EN_MINUS, 0x61 }, + { KEY_EN_LEFT_BRACKET, 0x62 }, + { KEY_EN_QUOTE, 0x63 }, + { KEY_EN_MENU, 0x65 }, + { KEY_EN_F10, 0x68 }, + { KEY_EN_EQUALS, 0x69 }, + { KEY_EN_RIGHT_BRACKET, 0x6A }, + { KEY_EN_POUND, 0x6B }, + { KEY_EN_F11, 0x70 }, + { KEY_EN_F12, 0x78 }, + { KEY_EN_BACKSPACE, 0x79 }, + { KEY_EN_ANSI_BACK_SLASH, 0x7A }, + { KEY_EN_ANSI_ENTER, 0x7B }, + { KEY_EN_RIGHT_SHIFT, 0x7C }, + { KEY_EN_RIGHT_CONTROL, 0x7D }, + { KEY_EN_PRINT_SCREEN, 0x80 }, + { KEY_EN_INSERT, 0x81 }, + { KEY_EN_DELETE, 0x82 }, + { KEY_EN_LEFT_ARROW, 0x85 }, + { KEY_EN_SCROLL_LOCK, 0x88 }, + { KEY_EN_HOME, 0x89 }, + { KEY_EN_END, 0x8A }, + { KEY_EN_UP_ARROW, 0x8C }, + { KEY_EN_DOWN_ARROW, 0x8D }, + { KEY_EN_PAUSE_BREAK, 0x90 }, + { KEY_EN_PAGE_UP, 0x91 }, + { KEY_EN_PAGE_DOWN, 0x92 }, + { KEY_EN_RIGHT_ARROW, 0x95 }, + { KEY_EN_NUMPAD_LOCK, 0x99 }, + { KEY_EN_NUMPAD_7, 0x9A }, + { KEY_EN_NUMPAD_4, 0x9B }, + { KEY_EN_NUMPAD_1, 0x9C }, + { KEY_EN_NUMPAD_0, 0x9D }, + { KEY_EN_NUMPAD_DIVIDE, 0xA1 }, + { KEY_EN_NUMPAD_8, 0xA2 }, + { KEY_EN_NUMPAD_5, 0xA3 }, + { KEY_EN_NUMPAD_2, 0xA4 }, + { KEY_EN_NUMPAD_TIMES, 0xA9 }, + { KEY_EN_NUMPAD_9, 0xAA }, + { KEY_EN_NUMPAD_6, 0xAB }, + { KEY_EN_NUMPAD_3, 0xAC }, + { KEY_EN_NUMPAD_PERIOD, 0xAD }, + { KEY_EN_NUMPAD_MINUS, 0xB1 }, + { KEY_EN_NUMPAD_PLUS, 0xB2 }, + { KEY_EN_NUMPAD_ENTER, 0xB4 }, }; static const std::vector default_tkl_led_names = { /* Key Label Index */ - { "Key: Escape", 0x00 }, - { "Key: `", 0x01 }, - { "Key: Tab", 0x02 }, - { "Key: Caps Lock", 0x03 }, - { "Key: Left Shift", 0x04 }, - { "Key: Left Control", 0x05 }, - { "Key: \\ (ISO)", 0x0C }, - { "Key: 1", 0x11 }, - { "Key: Q", 0x12 }, - { "Key: A", 0x13 }, - { "Key: Z", 0x14 }, - { "Key: F1", 0x18 }, - { "Key: 2", 0x19 }, - { "Key: W", 0x1A }, - { "Key: S", 0x1B }, - { "Key: X", 0x1C }, - { "Key: F2", 0x20 }, - { "Key: 3", 0x21 }, - { "Key: E", 0x22 }, - { "Key: D", 0x23 }, - { "Key: C", 0x24 }, - { "Key: F3", 0x28 }, - { "Key: 4", 0x29 }, - { "Key: R", 0x2A }, - { "Key: F", 0x2B }, - { "Key: V", 0x2C }, - { "Key: F4", 0x30 }, - { "Key: 5", 0x31 }, - { "Key: T", 0x32 }, - { "Key: G", 0x33 }, - { "Key: B", 0x34 }, - { "Key: Space", 0x35 }, - { "Key: 6", 0x39 }, - { "Key: Y", 0x3A }, - { "Key: H", 0x3B }, - { "Key: N", 0x3C }, - { "Key: F5", 0x40 }, - { "Key: 7", 0x41 }, - { "Key: U", 0x42 }, - { "Key: J", 0x43 }, - { "Key: M", 0x44 }, - { "Key: F6", 0x48 }, - { "Key: 8", 0x49 }, - { "Key: I", 0x4A }, - { "Key: K", 0x4B }, - { "Key: ,", 0x4C }, - { "Key: Right Alt", 0x4D }, - { "Key: F7", 0x50 }, - { "Key: 9", 0x51 }, - { "Key: O", 0x52 }, - { "Key: L", 0x53 }, - { "Key: .", 0x54 }, - { "Key: F8", 0x58 }, - { "Key: 0", 0x59 }, - { "Key: P", 0x5A }, - { "Key: ;", 0x5B }, - { "Key: /", 0x5C }, - { "Key: Right Fn", 0x5D }, - { "Key: F9", 0x60 }, - { "Key: -", 0x61 }, - { "Key: [", 0x62 }, - { "Key: '", 0x63 }, - { "Key: Menu", 0x65 }, - { "Key: F10", 0x68 }, - { "Key: =", 0x69 }, - { "Key: ]", 0x6A }, - { "Key: #", 0x6B }, - { "Key: F11", 0x70 }, - { "Key: F12", 0x78 }, - { "Key: Backspace", 0x79 }, - { "Key: \\ (ANSI)", 0x7A }, - { "Key: Enter", 0x7B }, - { "Key: Right Shift", 0x7C }, - { "Key: Right Control", 0x7D }, - { "Key: Insert", 0x81 }, - { "Key: Delete", 0x82 }, - { "Key: Left Arrow", 0x85 }, - { "Key: Home", 0x89 }, - { "Key: End", 0x8A }, - { "Key: Up Arrow", 0x8C }, - { "Key: Down Arrow", 0x8D }, - { "Key: Page Up", 0x91 }, - { "Key: Page Down", 0x92 }, - { "Key: Right Arrow", 0x95 }, + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_BACK_TICK, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + { KEY_EN_ISO_BACK_SLASH, 0x0C }, + { KEY_EN_1, 0x11 }, + { KEY_EN_Q, 0x12 }, + { KEY_EN_A, 0x13 }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_F1, 0x18 }, + { KEY_EN_2, 0x19 }, + { KEY_EN_W, 0x1A }, + { KEY_EN_S, 0x1B }, + { KEY_EN_X, 0x1C }, + { KEY_EN_F2, 0x20 }, + { KEY_EN_3, 0x21 }, + { KEY_EN_E, 0x22 }, + { KEY_EN_D, 0x23 }, + { KEY_EN_C, 0x24 }, + { KEY_EN_F3, 0x28 }, + { KEY_EN_4, 0x29 }, + { KEY_EN_R, 0x2A }, + { KEY_EN_F, 0x2B }, + { KEY_EN_V, 0x2C }, + { KEY_EN_F4, 0x30 }, + { KEY_EN_5, 0x31 }, + { KEY_EN_T, 0x32 }, + { KEY_EN_G, 0x33 }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + { KEY_EN_6, 0x39 }, + { KEY_EN_Y, 0x3A }, + { KEY_EN_H, 0x3B }, + { KEY_EN_N, 0x3C }, + { KEY_EN_F5, 0x40 }, + { KEY_EN_7, 0x41 }, + { KEY_EN_U, 0x42 }, + { KEY_EN_J, 0x43 }, + { KEY_EN_M, 0x44 }, + { KEY_EN_F6, 0x48 }, + { KEY_EN_8, 0x49 }, + { KEY_EN_I, 0x4A }, + { KEY_EN_K, 0x4B }, + { KEY_EN_COMMA, 0x4C }, + { KEY_EN_RIGHT_ALT, 0x4D }, + { KEY_EN_F7, 0x50 }, + { KEY_EN_9, 0x51 }, + { KEY_EN_O, 0x52 }, + { KEY_EN_L, 0x53 }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_F8, 0x58 }, + { KEY_EN_0, 0x59 }, + { KEY_EN_P, 0x5A }, + { KEY_EN_SEMICOLON, 0x5B }, + { KEY_EN_FORWARD_SLASH, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + { KEY_EN_F9, 0x60 }, + { KEY_EN_MINUS, 0x61 }, + { KEY_EN_LEFT_BRACKET, 0x62 }, + { KEY_EN_QUOTE, 0x63 }, + { KEY_EN_MENU, 0x65 }, + { KEY_EN_F10, 0x68 }, + { KEY_EN_EQUALS, 0x69 }, + { KEY_EN_RIGHT_BRACKET, 0x6A }, + { KEY_EN_POUND, 0x6B }, + { KEY_EN_F11, 0x70 }, + { KEY_EN_F12, 0x78 }, + { KEY_EN_BACKSPACE, 0x79 }, + { KEY_EN_ANSI_BACK_SLASH, 0x7A }, + { KEY_EN_ANSI_ENTER, 0x7B }, + { KEY_EN_RIGHT_SHIFT, 0x7C }, + { KEY_EN_RIGHT_CONTROL, 0x7D }, + { KEY_EN_INSERT, 0x81 }, + { KEY_EN_DELETE, 0x82 }, + { KEY_EN_LEFT_ARROW, 0x85 }, + { KEY_EN_HOME, 0x89 }, + { KEY_EN_END, 0x8A }, + { KEY_EN_UP_ARROW, 0x8C }, + { KEY_EN_DOWN_ARROW, 0x8D }, + { KEY_EN_PAGE_UP, 0x91 }, + { KEY_EN_PAGE_DOWN, 0x92 }, + { KEY_EN_RIGHT_ARROW, 0x95 }, { "Logo 1", 0x80 }, { "Logo 2", 0x90 }, { "Underglow 1", 0x06 }, @@ -272,74 +273,74 @@ static const std::vector default_tkl_led_names = static const std::vector default_65pct_led_names = { /* Key Label Index */ - { "Key: Escape", 0x00 }, - { "Key: Tab", 0x01 }, - { "Key: Caps Lock", 0x02 }, - { "Key: Left Shift", 0x03 }, - { "Key: Left Control", 0x04 }, - { "Key: 1", 0x08 }, - { "Key: Q", 0x09 }, - { "Key: A", 0x0A }, - { "Key: Left Windows", 0x0C }, - { "Key: 2", 0x10 }, - { "Key: W", 0x11 }, - { "Key: S", 0x12 }, - { "Key: Z", 0x13 }, - { "Key: Left Alt", 0x14 }, - { "Key: 3", 0x18 }, - { "Key: E", 0x19 }, - { "Key: D", 0x1A }, - { "Key: X", 0x1B }, - { "Key: 4", 0x20 }, - { "Key: R", 0x21 }, - { "Key: F", 0x22 }, - { "Key: C", 0x23 }, - { "Key: 5", 0x28 }, - { "Key: T", 0x29 }, - { "Key: G", 0x2A }, - { "Key: V", 0x2B }, - { "Key: 6", 0x30 }, - { "Key: Y", 0x31 }, - { "Key: H", 0x32 }, - { "Key: B", 0x33 }, - { "Key: Space", 0x34 }, - { "Key: 7", 0x38 }, - { "Key: U", 0x39 }, - { "Key: J", 0x3A }, - { "Key: N", 0x3B }, - { "Key: 8", 0x40 }, - { "Key: I", 0x41 }, - { "Key: K", 0x42 }, - { "Key: M", 0x43 }, - { "Key: 9", 0x48 }, - { "Key: O", 0x49 }, - { "Key: L", 0x4A }, - { "Key: ,", 0x4B }, - { "Key: Right Alt", 0x4C }, - { "Key: 0", 0x50 }, - { "Key: P", 0x51 }, - { "Key: ;", 0x52 }, - { "Key: .", 0x53 }, - { "Key: Right Fn", 0x54 }, - { "Key: -", 0x58 }, - { "Key: [", 0x59 }, - { "Key: '", 0x5A }, - { "Key: /", 0x5B }, - { "Key: Right Control", 0x5C }, - { "Key: =", 0x60 }, - { "Key: ]", 0x61 }, - { "Key: Right Shift", 0x63 }, - { "Key: Left Arrow", 0x64 }, - { "Key: Backspace", 0x68 }, - { "Key: \\ (ANSI)", 0x69 }, - { "Key: Enter", 0x6A }, - { "Key: Up Arrow", 0x6B }, - { "Key: Down Arrow", 0x6C }, - { "Key: Insert", 0x70 }, - { "Key: Delete", 0x71 }, - { "Key: Page Up", 0x72 }, - { "Key: Page Down", 0x73 }, - { "Key: Right Arrow", 0x74 }, + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_TAB, 0x01 }, + { KEY_EN_CAPS_LOCK, 0x02 }, + { KEY_EN_LEFT_SHIFT, 0x03 }, + { KEY_EN_LEFT_CONTROL, 0x04 }, + { KEY_EN_1, 0x08 }, + { KEY_EN_Q, 0x09 }, + { KEY_EN_A, 0x0A }, + { KEY_EN_LEFT_WINDOWS, 0x0C }, + { KEY_EN_2, 0x10 }, + { KEY_EN_W, 0x11 }, + { KEY_EN_S, 0x12 }, + { KEY_EN_Z, 0x13 }, + { KEY_EN_LEFT_ALT, 0x14 }, + { KEY_EN_3, 0x18 }, + { KEY_EN_E, 0x19 }, + { KEY_EN_D, 0x1A }, + { KEY_EN_X, 0x1B }, + { KEY_EN_4, 0x20 }, + { KEY_EN_R, 0x21 }, + { KEY_EN_F, 0x22 }, + { KEY_EN_C, 0x23 }, + { KEY_EN_5, 0x28 }, + { KEY_EN_T, 0x29 }, + { KEY_EN_G, 0x2A }, + { KEY_EN_V, 0x2B }, + { KEY_EN_6, 0x30 }, + { KEY_EN_Y, 0x31 }, + { KEY_EN_H, 0x32 }, + { KEY_EN_B, 0x33 }, + { KEY_EN_SPACE, 0x34 }, + { KEY_EN_7, 0x38 }, + { KEY_EN_U, 0x39 }, + { KEY_EN_J, 0x3A }, + { KEY_EN_N, 0x3B }, + { KEY_EN_8, 0x40 }, + { KEY_EN_I, 0x41 }, + { KEY_EN_K, 0x42 }, + { KEY_EN_M, 0x43 }, + { KEY_EN_9, 0x48 }, + { KEY_EN_O, 0x49 }, + { KEY_EN_L, 0x4A }, + { KEY_EN_COMMA, 0x4B }, + { KEY_EN_RIGHT_ALT, 0x4C }, + { KEY_EN_0, 0x50 }, + { KEY_EN_P, 0x51 }, + { KEY_EN_SEMICOLON, 0x52 }, + { KEY_EN_PERIOD, 0x53 }, + { KEY_EN_RIGHT_FUNCTION, 0x54 }, + { KEY_EN_MINUS, 0x58 }, + { KEY_EN_LEFT_BRACKET, 0x59 }, + { KEY_EN_QUOTE, 0x5A }, + { KEY_EN_FORWARD_SLASH, 0x5B }, + { KEY_EN_RIGHT_CONTROL, 0x5C }, + { KEY_EN_EQUALS, 0x60 }, + { KEY_EN_RIGHT_BRACKET, 0x61 }, + { KEY_EN_RIGHT_SHIFT, 0x63 }, + { KEY_EN_LEFT_ARROW, 0x64 }, + { KEY_EN_BACKSPACE, 0x68 }, + { KEY_EN_ANSI_BACK_SLASH, 0x69 }, + { KEY_EN_ANSI_ENTER, 0x6A }, + { KEY_EN_UP_ARROW, 0x6B }, + { KEY_EN_DOWN_ARROW, 0x6C }, + { KEY_EN_INSERT, 0x70 }, + { KEY_EN_DELETE, 0x71 }, + { KEY_EN_PAGE_UP, 0x72 }, + { KEY_EN_PAGE_DOWN, 0x73 }, + { KEY_EN_RIGHT_ARROW, 0x74 }, }; RGBController_AuraKeyboard::RGBController_AuraKeyboard(AuraKeyboardController* controller_ptr, AuraKeyboardMappingLayoutType keyboard_layout) @@ -395,8 +396,8 @@ void RGBController_AuraKeyboard::SetupZones() led_names = default_led_names; led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}}); - led_names.insert(led_names.begin() + 7, {"Key: Left Windows", 0x15}); - led_names.insert(led_names.begin() + 12, {"Key: Left Alt", 0x1D}); + led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x15}); + led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x1D}); break; case SCOPE_RX_LAYOUT: @@ -404,8 +405,8 @@ void RGBController_AuraKeyboard::SetupZones() led_zones.push_back({"Keyboard", ZONE_TYPE_MATRIX, 106, new matrix_map_type{6, 22, (unsigned int *)&scope_matrix_map}}); led_zones.push_back({"Logo", ZONE_TYPE_SINGLE, 1}); - led_names.insert(led_names.begin() + 7, {"Key: Left Windows", 0x15}); - led_names.insert(led_names.begin() + 12, {"Key: Left Alt", 0x1D}); + led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x15}); + led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x1D}); led_names.push_back({ "Logo", 0xB0}); break; @@ -415,8 +416,8 @@ void RGBController_AuraKeyboard::SetupZones() led_zones.push_back({"Logo", ZONE_TYPE_LINEAR, 2}); led_zones.push_back({"Underglow", ZONE_TYPE_LINEAR, 26}); - led_names.insert(led_names.begin() + 7, {"Key: Left Windows", 0x15}); - led_names.insert(led_names.begin() + 12, {"Key: Left Alt", 0x1D}); + led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x15}); + led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x1D}); break; case FLARE_LAYOUT: @@ -425,8 +426,8 @@ void RGBController_AuraKeyboard::SetupZones() led_zones.push_back({"Logo", ZONE_TYPE_SINGLE, 1}); led_zones.push_back({"Underglow", ZONE_TYPE_SINGLE, 2}); - led_names.insert(led_names.begin() + 7, {"Key: Left Windows", 0x0D}); - led_names.insert(led_names.begin() + 12, {"Key: Left Alt", 0x15}); + led_names.insert(led_names.begin() + 7, {KEY_EN_LEFT_WINDOWS, 0x0D}); + led_names.insert(led_names.begin() + 12, {KEY_EN_LEFT_ALT, 0x15}); led_names.push_back({ "Logo", 0xB8}); led_names.push_back({ "Left Underglow", 0xB9}); diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp index c1bc5eb9..eb008785 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp @@ -4,6 +4,7 @@ | Driver for Corsair K100 Keyboard | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_CorsairK100.h" #include "LogManager.h" @@ -22,119 +23,119 @@ static unsigned int matrix_map_k100[7][24] = static const char* led_names_k100[] = { - "Key: Escape", //0 - "Key: `", //1 - "Key: Tab", //2 - "Key: Caps Lock", //3 - "Key: Left Shift", //4 - "Key: Left Control", //5 - "Key: F12", //6 - "Key: =", //7 - "Key: Lock", //8 - "Key: Number Pad 7", //9 - "Key: F1", //12 - "Key: 1", //13 - "Key: Q", //14 - "Key: A", //15 - "Key: Left Windows", //17 - "Key: Print Screen", //18 - "Key: Media Mute", //20 - "Key: Number Pad 8", //21 - "Key: F2", //24 - "Key: 2", //25 - "Key: W", //26 - "Key: S", //27 - "Key: Z", //28 - "Key: Left Alt", //29 - "Key: Scroll Lock", //30 - "Key: Backspace", //31 - "Key: Media Stop", //32 - "Key: Number Pad 9", //33 - "Key: F3", //36 - "Key: 3", //37 - "Key: E", //38 - "Key: D", //39 - "Key: X", //40 - "Key: Pause/Break", //42 - "Key: Delete", //43 - "Key: Media Previous", //44 - "Key: F4", //48 - "Key: 4", //49 - "Key: R", //50 - "Key: F", //51 - "Key: C", //52 - "Key: Space", //53 - "Key: Insert", //54 - "Key: End", //55 - "Key: Media Play/Pause",//56 - "Key: Number Pad 4", //57 - "Key: F5", //60 - "Key: 5", //61 - "Key: T", //62 - "Key: G", //63 - "Key: V", //64 - "Key: Home", //66 - "Key: Page Down", //67 - "Key: Media Next", //68 - "Key: Number Pad 5", //69 - "Key: F6", //72 - "Key: 6", //73 - "Key: Y", //74 - "Key: H", //75 - "Key: B", //76 - "Key: Page Up", //78 - "Key: Right Shift", //79 - "Key: Num Lock", //80 - "Key: Number Pad 6", //81 - "Key: F7", //84 - "Key: 7", //85 - "Key: U", //86 - "Key: J", //87 - "Key: N", //88 - "Key: Right Alt", //89 - "Key: ]", //90 - "Key: Right Control", //91 - "Key: Number Pad /", //92 - "Key: Number Pad 1", //93 - "Key: F8", //96 - "Key: 8", //97 - "Key: I", //98 - "Key: K", //99 - "Key: M", //100 - "Key: Right Windows", //101 - "Key: \\ (ANSI)", //102 - "Key: Up Arrow", //103 - "Key: Number Pad *", //104 - "Key: Number Pad 2", //105 - "Key: F9", //108 - "Key: 9", //109 - "Key: O", //110 - "Key: L", //111 - "Key: ,", //112 - "Key: Menu", //113 - "Key: Left Arrow", //115 - "Key: Number Pad -", //116 - "Key: Number Pad 3", //117 - "Key: F10", //120 - "Key: 0", //121 - "Key: P", //122 - "Key: ;", //123 - "Key: .", //124 - "Key: Enter", //126 - "Key: Down Arrow", //127 - "Key: Number Pad +", //128 - "Key: Number Pad 0", //129 - "Key: F11", //132 - "Key: -", //133 - "Key: [", //134 - "Key: '", //135 - "Key: /", //136 -// "Key: Brightness", //137 - "Key: Right Arrow", //139 - "Key: Number Pad Enter",//140 - "Key: Number Pad .", //141 + KEY_EN_ESCAPE, //0 + KEY_EN_BACK_TICK, //1 + KEY_EN_TAB, //2 + KEY_EN_CAPS_LOCK, //3 + KEY_EN_LEFT_SHIFT, //4 + KEY_EN_LEFT_CONTROL, //5 + KEY_EN_F12, //6 + KEY_EN_EQUALS, //7 + "Key: Lock", //8 + KEY_EN_NUMPAD_7, //9 + KEY_EN_F1, //12 + KEY_EN_1, //13 + KEY_EN_Q, //14 + KEY_EN_A, //15 + KEY_EN_LEFT_WINDOWS, //17 + KEY_EN_PRINT_SCREEN, //18 + KEY_EN_MEDIA_MUTE, //20 + KEY_EN_NUMPAD_8, //21 + KEY_EN_F2, //24 + KEY_EN_2, //25 + KEY_EN_W, //26 + KEY_EN_S, //27 + KEY_EN_Z, //28 + KEY_EN_LEFT_ALT, //29 + KEY_EN_SCROLL_LOCK, //30 + KEY_EN_BACKSPACE, //31 + KEY_EN_MEDIA_STOP, //32 + KEY_EN_NUMPAD_9, //33 + KEY_EN_F3, //36 + KEY_EN_3, //37 + KEY_EN_E, //38 + KEY_EN_D, //39 + KEY_EN_X, //40 + KEY_EN_PAUSE_BREAK, //42 + KEY_EN_DELETE, //43 + KEY_EN_MEDIA_PREVIOUS, //44 + KEY_EN_F4, //48 + KEY_EN_4, //49 + KEY_EN_R, //50 + KEY_EN_F, //51 + KEY_EN_C, //52 + KEY_EN_SPACE, //53 + KEY_EN_INSERT, //54 + KEY_EN_END, //55 + KEY_EN_MEDIA_PLAY_PAUSE, //56 + KEY_EN_NUMPAD_4, //57 + KEY_EN_F5, //60 + KEY_EN_5, //61 + KEY_EN_T, //62 + KEY_EN_G, //63 + KEY_EN_V, //64 + KEY_EN_HOME, //66 + KEY_EN_PAGE_DOWN, //67 + KEY_EN_MEDIA_NEXT, //68 + KEY_EN_NUMPAD_5, //69 + KEY_EN_F6, //72 + KEY_EN_6, //73 + KEY_EN_Y, //74 + KEY_EN_H, //75 + KEY_EN_B, //76 + KEY_EN_PAGE_UP, //78 + KEY_EN_RIGHT_SHIFT, //79 + KEY_EN_NUMPAD_LOCK, //80 + KEY_EN_NUMPAD_6, //81 + KEY_EN_F7, //84 + KEY_EN_7, //85 + KEY_EN_U, //86 + KEY_EN_J, //87 + KEY_EN_N, //88 + KEY_EN_RIGHT_ALT, //89 + KEY_EN_RIGHT_BRACKET, //90 + KEY_EN_RIGHT_CONTROL, //91 + KEY_EN_NUMPAD_DIVIDE, //92 + KEY_EN_NUMPAD_1, //93 + KEY_EN_F8, //96 + KEY_EN_8, //97 + KEY_EN_I, //98 + KEY_EN_K, //99 + KEY_EN_M, //100 + KEY_EN_RIGHT_WINDOWS, //101 + KEY_EN_ANSI_BACK_SLASH, //102 + KEY_EN_UP_ARROW, //103 + KEY_EN_NUMPAD_TIMES, //104 + KEY_EN_NUMPAD_2, //105 + KEY_EN_F9, //108 + KEY_EN_9, //109 + KEY_EN_O, //110 + KEY_EN_L, //111 + KEY_EN_COMMA, //112 + KEY_EN_MENU, //113 + KEY_EN_LEFT_ARROW, //115 + KEY_EN_NUMPAD_MINUS, //116 + KEY_EN_NUMPAD_3, //117 + KEY_EN_F10, //120 + KEY_EN_0, //121 + KEY_EN_P, //122 + KEY_EN_SEMICOLON, //123 + KEY_EN_PERIOD, //124 + KEY_EN_ANSI_ENTER, //126 + KEY_EN_DOWN_ARROW, //127 + KEY_EN_NUMPAD_PLUS, //128 + KEY_EN_NUMPAD_0, //129 + KEY_EN_F11, //132 + KEY_EN_MINUS, //133 + KEY_EN_LEFT_BRACKET, //134 + KEY_EN_QUOTE, //135 + KEY_EN_FORWARD_SLASH, //136 + // "Key: Brightness", //137 + KEY_EN_RIGHT_ARROW, //139 + KEY_EN_NUMPAD_ENTER, //140 + KEY_EN_NUMPAD_PERIOD, //141 "Key: / (ISO)", - "Key: \\ (ISO)", + KEY_EN_ISO_BACK_SLASH, "Key: Preset", "Key: G1", "Key: G2", diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp index 6c5235ff..5ffaad3c 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 1/9/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_CorsairPeripheral.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -148,361 +149,361 @@ static const zone_type zone_types_k55[] = static const char* led_names[] = { - "Key: Escape", //0 - "Key: `", //1 - "Key: Tab", //2 - "Key: Caps Lock", //3 - "Key: Left Shift", //4 - "Key: Left Control", //5 - "Key: F12", //6 - "Key: =", //7 - "Key: Lock", //8 - "Key: Number Pad 7", //9 - "Key: F1", //12 - "Key: 1", //13 - "Key: Q", //14 - "Key: A", //15 - "Key: Left Windows", //17 - "Key: Print Screen", //18 - "Key: Media Mute", //20 - "Key: Number Pad 8", //21 - "Key: F2", //24 - "Key: 2", //25 - "Key: W", //26 - "Key: S", //27 - "Key: Z", //28 - "Key: Left Alt", //29 - "Key: Scroll Lock", //30 - "Key: Backspace", //31 - "Key: Media Stop", //32 - "Key: Number Pad 9", //33 - "Key: F3", //36 - "Key: 3", //37 - "Key: E", //38 - "Key: D", //39 - "Key: X", //40 - "Key: Pause/Break", //42 - "Key: Delete", //43 - "Key: Media Previous", //44 - "Key: F4", //48 - "Key: 4", //49 - "Key: R", //50 - "Key: F", //51 - "Key: C", //52 - "Key: Space", //53 - "Key: Insert", //54 - "Key: End", //55 - "Key: Media Play/Pause",//56 - "Key: Number Pad 4", //57 - "Key: F5", //60 - "Key: 5", //61 - "Key: T", //62 - "Key: G", //63 - "Key: V", //64 - "Key: Home", //66 - "Key: Page Down", //67 - "Key: Media Next", //68 - "Key: Number Pad 5", //69 - "Key: F6", //72 - "Key: 6", //73 - "Key: Y", //74 - "Key: H", //75 - "Key: B", //76 - "Key: Page Up", //78 - "Key: Right Shift", //79 - "Key: Num Lock", //80 - "Key: Number Pad 6", //81 - "Key: F7", //84 - "Key: 7", //85 - "Key: U", //86 - "Key: J", //87 - "Key: N", //88 - "Key: Right Alt", //89 - "Key: ]", //90 - "Key: Right Control", //91 - "Key: Number Pad /", //92 - "Key: Number Pad 1", //93 - "Key: F8", //96 - "Key: 8", //97 - "Key: I", //98 - "Key: K", //99 - "Key: M", //100 - "Key: Right Windows", //101 - "Key: \\ (ANSI)", //102 - "Key: Up Arrow", //103 - "Key: Number Pad *", //104 - "Key: Number Pad 2", //105 - "Key: F9", //108 - "Key: 9", //109 - "Key: O", //110 - "Key: L", //111 - "Key: ,", //112 - "Key: Menu", //113 - "Key: Left Arrow", //115 - "Key: Number Pad -", //116 - "Key: Number Pad 3", //117 - "Key: F10", //120 - "Key: 0", //121 - "Key: P", //122 - "Key: ;", //123 - "Key: .", //124 - "Key: Enter", //126 - "Key: Down Arrow", //127 - "Key: Number Pad +", //128 - "Key: Number Pad 0", //129 - "Key: F11", //132 - "Key: -", //133 - "Key: [", //134 - "Key: '", //135 - "Key: /", //136 - "Key: Brightness", //137 - "Key: Right Arrow", //139 - "Key: Number Pad Enter",//140 - "Key: Number Pad .", //141 + KEY_EN_ESCAPE, //0 + KEY_EN_BACK_TICK, //1 + KEY_EN_TAB, //2 + KEY_EN_CAPS_LOCK, //3 + KEY_EN_LEFT_SHIFT, //4 + KEY_EN_LEFT_CONTROL, //5 + KEY_EN_F12, //6 + KEY_EN_EQUALS, //7 + "Key: Lock", //8 + KEY_EN_NUMPAD_7, //9 + KEY_EN_F1, //12 + KEY_EN_1, //13 + KEY_EN_Q, //14 + KEY_EN_A, //15 + KEY_EN_LEFT_WINDOWS, //17 + KEY_EN_PRINT_SCREEN, //18 + KEY_EN_MEDIA_MUTE, //20 + KEY_EN_NUMPAD_8, //21 + KEY_EN_F2, //24 + KEY_EN_2, //25 + KEY_EN_W, //26 + KEY_EN_S, //27 + KEY_EN_Z, //28 + KEY_EN_LEFT_ALT, //29 + KEY_EN_SCROLL_LOCK, //30 + KEY_EN_BACKSPACE, //31 + KEY_EN_MEDIA_STOP, //32 + KEY_EN_NUMPAD_9, //33 + KEY_EN_F3, //36 + KEY_EN_3, //37 + KEY_EN_E, //38 + KEY_EN_D, //39 + KEY_EN_X, //40 + KEY_EN_PAUSE_BREAK, //42 + KEY_EN_DELETE, //43 + KEY_EN_MEDIA_PREVIOUS, //44 + KEY_EN_F4, //48 + KEY_EN_4, //49 + KEY_EN_R, //50 + KEY_EN_F, //51 + KEY_EN_C, //52 + KEY_EN_SPACE, //53 + KEY_EN_INSERT, //54 + KEY_EN_END, //55 + KEY_EN_MEDIA_PLAY_PAUSE, //56 + KEY_EN_NUMPAD_4, //57 + KEY_EN_F5, //60 + KEY_EN_5, //61 + KEY_EN_T, //62 + KEY_EN_G, //63 + KEY_EN_V, //64 + KEY_EN_HOME, //66 + KEY_EN_PAGE_DOWN, //67 + KEY_EN_MEDIA_NEXT, //68 + KEY_EN_NUMPAD_5, //69 + KEY_EN_F6, //72 + KEY_EN_6, //73 + KEY_EN_Y, //74 + KEY_EN_H, //75 + KEY_EN_B, //76 + KEY_EN_PAGE_UP, //78 + KEY_EN_RIGHT_SHIFT, //79 + KEY_EN_NUMPAD_LOCK, //80 + KEY_EN_NUMPAD_6, //81 + KEY_EN_F7, //84 + KEY_EN_7, //85 + KEY_EN_U, //86 + KEY_EN_J, //87 + KEY_EN_N, //88 + KEY_EN_RIGHT_ALT, //89 + KEY_EN_RIGHT_BRACKET, //90 + KEY_EN_RIGHT_CONTROL, //91 + KEY_EN_NUMPAD_DIVIDE, //92 + KEY_EN_NUMPAD_1, //93 + KEY_EN_F8, //96 + KEY_EN_8, //97 + KEY_EN_I, //98 + KEY_EN_K, //99 + KEY_EN_M, //100 + KEY_EN_RIGHT_WINDOWS, //101 + KEY_EN_ANSI_BACK_SLASH, //102 + KEY_EN_UP_ARROW, //103 + KEY_EN_NUMPAD_TIMES, //104 + KEY_EN_NUMPAD_2, //105 + KEY_EN_F9, //108 + KEY_EN_9, //109 + KEY_EN_O, //110 + KEY_EN_L, //111 + KEY_EN_COMMA, //112 + KEY_EN_MENU, //113 + KEY_EN_LEFT_ARROW, //115 + KEY_EN_NUMPAD_MINUS, //116 + KEY_EN_NUMPAD_3, //117 + KEY_EN_F10, //120 + KEY_EN_0, //121 + KEY_EN_P, //122 + KEY_EN_SEMICOLON, //123 + KEY_EN_PERIOD, //124 + KEY_EN_ANSI_ENTER, //126 + KEY_EN_DOWN_ARROW, //127 + KEY_EN_NUMPAD_PLUS, //128 + KEY_EN_NUMPAD_0, //129 + KEY_EN_F11, //132 + KEY_EN_MINUS, //133 + KEY_EN_LEFT_BRACKET, //134 + KEY_EN_QUOTE, //135 + KEY_EN_FORWARD_SLASH, //136 + "Key: Brightness", //137 + KEY_EN_RIGHT_ARROW, //139 + KEY_EN_NUMPAD_ENTER, //140 + KEY_EN_NUMPAD_PERIOD, //141 "Key: / (ISO)", - "Key: \\ (ISO)", + KEY_EN_ISO_BACK_SLASH, }; static const char* led_names_k70_mk2[] = { - "Key: Escape", //0 - "Key: `", //1 - "Key: Tab", //2 - "Key: Caps Lock", //3 - "Key: Left Shift", //4 - "Key: Left Control", //5 - "Key: F12", //6 - "Key: =", //7 - "Key: Lock", //8 - "Key: Number Pad 7", //9 - "Key: F1", //12 - "Key: 1", //13 - "Key: Q", //14 - "Key: A", //15 - //"Key: / (ISO)", //16 - "Key: Left Windows", //17 - "Key: Print Screen", //18 - "Key: Media Mute", //20 - "Key: Number Pad 8", //21 - "Key: F2", //24 - "Key: 2", //25 - "Key: W", //26 - "Key: S", //27 - "Key: Z", //28 - "Key: Left Alt", //29 - "Key: Scroll Lock", //30 - "Key: Backspace", //31 - "Key: Media Stop", //32 - "Key: Number Pad 9", //33 - "Key: F3", //36 - "Key: 3", //37 - "Key: E", //38 - "Key: D", //39 - "Key: X", //40 - "Key: Pause/Break", //42 - "Key: Delete", //43 - "Key: Media Previous", //44 - //"Key: Logo Left", //047 - "Key: F4", //48 - "Key: 4", //49 - "Key: R", //50 - "Key: F", //51 - "Key: C", //52 - "Key: Space", //53 - "Key: Insert", //54 - "Key: End", //55 - "Key: Media Play/Pause",//56 - "Key: Number Pad 4", //57 - //"Key: Logo Right", //059 - "Key: F5", //60 - "Key: 5", //61 - "Key: T", //62 - "Key: G", //63 - "Key: V", //64 - "Key: Home", //66 - "Key: Page Down", //67 - "Key: Media Next", //68 - "Key: Number Pad 5", //69 - "Key: F6", //72 - "Key: 6", //73 - "Key: Y", //74 - "Key: H", //75 - "Key: B", //76 - "Key: Page Up", //78 - "Key: Right Shift", //79 - "Key: Num Lock", //80 - "Key: Number Pad 6", //81 - "Key: F7", //84 - "Key: 7", //85 - "Key: U", //86 - "Key: J", //87 - "Key: N", //88 - "Key: Right Alt", //89 - "Key: ]", //90 - "Key: Right Control", //91 - "Key: Number Pad /", //92 - "Key: Number Pad 1", //93 - "Key: F8", //96 - "Key: 8", //97 - "Key: I", //98 - "Key: K", //99 - "Key: M", //100 - "Key: Right Windows", //101 - "Key: \\ (ANSI)", //102 - "Key: Up Arrow", //103 - "Key: Number Pad *", //104 - "Key: Number Pad 2", //105 - "Key: F9", //108 - "Key: 9", //109 - "Key: O", //110 - "Key: L", //111 - "Key: ,", //112 - "Key: Menu", //113 - //"Key: \\ (ISO)", //114 - "Key: Left Arrow", //115 - "Key: Number Pad -", //116 - "Key: Number Pad 3", //117 - "Key: F10", //120 - "Key: 0", //121 - "Key: P", //122 - "Key: ;", //123 - //"Key: Profile", //125 - "Key: .", //124 - "Key: Enter", //126 - "Key: Down Arrow", //127 - "Key: Number Pad +", //128 - "Key: Number Pad 0", //129 - "Key: F11", //132 - "Key: -", //133 - "Key: [", //134 - "Key: '", //135 - "Key: /", //136 - "Key: Brightness", //137 - "Key: Right Arrow", //139 - "Key: Number Pad Enter",//140 - "Key: Number Pad .", //141 - "Key: / (ISO)", //16 - "Key: \\ (ISO)", //114 - "Key: Logo Left", //047 - "Key: Logo Right", //059 - "Key: Profile", //125 + KEY_EN_ESCAPE, //0 + KEY_EN_BACK_TICK, //1 + KEY_EN_TAB, //2 + KEY_EN_CAPS_LOCK, //3 + KEY_EN_LEFT_SHIFT, //4 + KEY_EN_LEFT_CONTROL, //5 + KEY_EN_F12, //6 + KEY_EN_EQUALS, //7 + "Key: Lock", //8 + KEY_EN_NUMPAD_7, //9 + KEY_EN_F1, //12 + KEY_EN_1, //13 + KEY_EN_Q, //14 + KEY_EN_A, //15 + //"Key: / (ISO)", //16 + KEY_EN_LEFT_WINDOWS, //17 + KEY_EN_PRINT_SCREEN, //18 + KEY_EN_MEDIA_MUTE, //20 + KEY_EN_NUMPAD_8, //21 + KEY_EN_F2, //24 + KEY_EN_2, //25 + KEY_EN_W, //26 + KEY_EN_S, //27 + KEY_EN_Z, //28 + KEY_EN_LEFT_ALT, //29 + KEY_EN_SCROLL_LOCK, //30 + KEY_EN_BACKSPACE, //31 + KEY_EN_MEDIA_STOP, //32 + KEY_EN_NUMPAD_9, //33 + KEY_EN_F3, //36 + KEY_EN_3, //37 + KEY_EN_E, //38 + KEY_EN_D, //39 + KEY_EN_X, //40 + KEY_EN_PAUSE_BREAK, //42 + KEY_EN_DELETE, //43 + KEY_EN_MEDIA_PREVIOUS, //44 + //"Key: Logo Left", //047 + KEY_EN_F4, //48 + KEY_EN_4, //49 + KEY_EN_R, //50 + KEY_EN_F, //51 + KEY_EN_C, //52 + KEY_EN_SPACE, //53 + KEY_EN_INSERT, //54 + KEY_EN_END, //55 + KEY_EN_MEDIA_PLAY_PAUSE, //56 + KEY_EN_NUMPAD_4, //57 + //"Key: Logo Right", //059 + KEY_EN_F5, //60 + KEY_EN_5, //61 + KEY_EN_T, //62 + KEY_EN_G, //63 + KEY_EN_V, //64 + KEY_EN_HOME, //66 + KEY_EN_PAGE_DOWN, //67 + KEY_EN_MEDIA_NEXT, //68 + KEY_EN_NUMPAD_5, //69 + KEY_EN_F6, //72 + KEY_EN_6, //73 + KEY_EN_Y, //74 + KEY_EN_H, //75 + KEY_EN_B, //76 + KEY_EN_PAGE_UP, //78 + KEY_EN_RIGHT_SHIFT, //79 + KEY_EN_NUMPAD_LOCK, //80 + KEY_EN_NUMPAD_6, //81 + KEY_EN_F7, //84 + KEY_EN_7, //85 + KEY_EN_U, //86 + KEY_EN_J, //87 + KEY_EN_N, //88 + KEY_EN_RIGHT_ALT, //89 + KEY_EN_RIGHT_BRACKET, //90 + KEY_EN_RIGHT_CONTROL, //91 + KEY_EN_NUMPAD_DIVIDE, //92 + KEY_EN_NUMPAD_1, //93 + KEY_EN_F8, //96 + KEY_EN_8, //97 + KEY_EN_I, //98 + KEY_EN_K, //99 + KEY_EN_M, //100 + KEY_EN_RIGHT_WINDOWS, //101 + KEY_EN_ANSI_BACK_SLASH, //102 + KEY_EN_UP_ARROW, //103 + KEY_EN_NUMPAD_TIMES, //104 + KEY_EN_NUMPAD_2, //105 + KEY_EN_F9, //108 + KEY_EN_9, //109 + KEY_EN_O, //110 + KEY_EN_L, //111 + KEY_EN_COMMA, //112 + KEY_EN_MENU, //113 + //KEY_EN_ISO_BACK_SLASH, //114 + KEY_EN_LEFT_ARROW, //115 + KEY_EN_NUMPAD_MINUS, //116 + KEY_EN_NUMPAD_3, //117 + KEY_EN_F10, //120 + KEY_EN_0, //121 + KEY_EN_P, //122 + KEY_EN_SEMICOLON, //123 + //"Key: Profile", //125 + KEY_EN_PERIOD, //124 + KEY_EN_ANSI_ENTER, //126 + KEY_EN_DOWN_ARROW, //127 + KEY_EN_NUMPAD_PLUS, //128 + KEY_EN_NUMPAD_0, //129 + KEY_EN_F11, //132 + KEY_EN_MINUS, //133 + KEY_EN_LEFT_BRACKET, //134 + KEY_EN_QUOTE, //135 + KEY_EN_FORWARD_SLASH, //136 + "Key: Brightness", //137 + KEY_EN_RIGHT_ARROW, //139 + KEY_EN_NUMPAD_ENTER, //140 + KEY_EN_NUMPAD_PERIOD, //141 + "Key: / (ISO)", //16 + KEY_EN_ISO_BACK_SLASH, //114 + "Key: Logo Left", //047 + "Key: Logo Right", //059 + "Key: Profile", //125 }; static const char* led_names_k95_plat[] = { - "Key: Escape", //0 - "Key: `", //1 - "Key: Tab", //2 - "Key: Caps Lock", //3 - "Key: Left Shift", //4 - "Key: Left Control", //5 - "Key: F12", //6 - "Key: =", //7 - "Key: Lock", //8 - "Key: Number Pad 7", //9 - "Key: F1", //12 - "Key: 1", //13 - "Key: Q", //14 - "Key: A", //15 - "Key: Left Windows", //17 - "Key: Print Screen", //18 - "Key: Media Mute", //20 - "Key: Number Pad 8", //21 - "Key: F2", //24 - "Key: 2", //25 - "Key: W", //26 - "Key: S", //27 - "Key: Z", //28 - "Key: Left Alt", //29 - "Key: Scroll Lock", //30 - "Key: Backspace", //31 - "Key: Media Stop", //32 - "Key: Number Pad 9", //33 - "Key: F3", //36 - "Key: 3", //37 - "Key: E", //38 - "Key: D", //39 - "Key: X", //40 - "Key: Pause/Break", //42 - "Key: Delete", //43 - "Key: Media Previous", //44 - "Key: F4", //48 - "Key: 4", //49 - "Key: R", //50 - "Key: F", //51 - "Key: C", //52 - "Key: Space", //53 - "Key: Insert", //54 - "Key: End", //55 - "Key: Media Play/Pause",//56 - "Key: Number Pad 4", //57 - "Key: F5", //60 - "Key: 5", //61 - "Key: T", //62 - "Key: G", //63 - "Key: V", //64 - "Key: Home", //66 - "Key: Page Down", //67 - "Key: Media Next", //68 - "Key: Number Pad 5", //69 - "Key: F6", //72 - "Key: 6", //73 - "Key: Y", //74 - "Key: H", //75 - "Key: B", //76 - "Key: Page Up", //78 - "Key: Right Shift", //79 - "Key: Num Lock", //80 - "Key: Number Pad 6", //81 - "Key: F7", //84 - "Key: 7", //85 - "Key: U", //86 - "Key: J", //87 - "Key: N", //88 - "Key: Right Alt", //89 - "Key: ]", //90 - "Key: Right Control", //91 - "Key: Number Pad /", //92 - "Key: Number Pad 1", //93 - "Key: F8", //96 - "Key: 8", //97 - "Key: I", //98 - "Key: K", //99 - "Key: M", //100 - "Key: Right Windows", //101 - "Key: \\ (ANSI)", //102 - "Key: Up Arrow", //103 - "Key: Number Pad *", //104 - "Key: Number Pad 2", //105 - "Key: F9", //108 - "Key: 9", //109 - "Key: O", //110 - "Key: L", //111 - "Key: ,", //112 - "Key: Menu", //113 - "Key: Left Arrow", //115 - "Key: Number Pad -", //116 - "Key: Number Pad 3", //117 - "Key: F10", //120 - "Key: 0", //121 - "Key: P", //122 - "Key: ;", //123 - "Key: .", //124 - "Key: Enter", //126 - "Key: Down Arrow", //127 - "Key: Number Pad +", //128 - "Key: Number Pad 0", //129 - "Key: F11", //132 - "Key: -", //133 - "Key: [", //134 - "Key: '", //135 - "Key: /", //136 - "Key: Brightness", //137 - "Key: Right Arrow", //139 - "Key: Number Pad Enter",//140 - "Key: Number Pad .", //141 + KEY_EN_ESCAPE, //0 + KEY_EN_BACK_TICK, //1 + KEY_EN_TAB, //2 + KEY_EN_CAPS_LOCK , //3 + KEY_EN_LEFT_SHIFT, //4 + KEY_EN_LEFT_CONTROL, //5 + KEY_EN_F12, //6 + KEY_EN_EQUALS, //7 + "Key: Lock", //8 + KEY_EN_NUMPAD_7, //9 + KEY_EN_F1, //12 + KEY_EN_1, //13 + KEY_EN_Q, //14 + KEY_EN_A, //15 + KEY_EN_LEFT_WINDOWS, //17 + KEY_EN_PRINT_SCREEN, //18 + KEY_EN_MEDIA_MUTE, //20 + KEY_EN_NUMPAD_8, //21 + KEY_EN_F2, //24 + KEY_EN_2, //25 + KEY_EN_W, //26 + KEY_EN_S, //27 + KEY_EN_Z, //28 + KEY_EN_LEFT_ALT, //29 + KEY_EN_SCROLL_LOCK, //30 + KEY_EN_BACKSPACE, //31 + KEY_EN_MEDIA_STOP, //32 + KEY_EN_NUMPAD_9, //33 + KEY_EN_F3, //36 + KEY_EN_3, //37 + KEY_EN_E, //38 + KEY_EN_D, //39 + KEY_EN_X, //40 + KEY_EN_PAUSE_BREAK, //42 + KEY_EN_DELETE, //43 + KEY_EN_MEDIA_PREVIOUS, //44 + KEY_EN_F4, //48 + KEY_EN_4, //49 + KEY_EN_R, //50 + KEY_EN_F, //51 + KEY_EN_C, //52 + KEY_EN_SPACE, //53 + KEY_EN_INSERT, //54 + KEY_EN_END, //55 + KEY_EN_MEDIA_PLAY_PAUSE, //56 + KEY_EN_NUMPAD_4, //57 + KEY_EN_F5, //60 + KEY_EN_5, //61 + KEY_EN_T, //62 + KEY_EN_G, //63 + KEY_EN_V, //64 + KEY_EN_HOME, //66 + KEY_EN_PAGE_DOWN, //67 + KEY_EN_MEDIA_NEXT, //68 + KEY_EN_NUMPAD_5, //69 + KEY_EN_F6, //72 + KEY_EN_6, //73 + KEY_EN_Y, //74 + KEY_EN_H, //75 + KEY_EN_B, //76 + KEY_EN_PAGE_UP, //78 + KEY_EN_RIGHT_SHIFT, //79 + KEY_EN_NUMPAD_LOCK, //80 + KEY_EN_NUMPAD_6, //81 + KEY_EN_F7, //84 + KEY_EN_7, //85 + KEY_EN_U, //86 + KEY_EN_J, //87 + KEY_EN_N, //88 + KEY_EN_RIGHT_ALT, //89 + KEY_EN_RIGHT_BRACKET, //90 + KEY_EN_RIGHT_CONTROL, //91 + KEY_EN_NUMPAD_DIVIDE, //92 + KEY_EN_NUMPAD_1, //93 + KEY_EN_F8, //96 + KEY_EN_8, //97 + KEY_EN_I, //98 + KEY_EN_K, //99 + KEY_EN_M, //100 + KEY_EN_RIGHT_WINDOWS, //101 + KEY_EN_ANSI_BACK_SLASH, //102 + KEY_EN_UP_ARROW, //103 + KEY_EN_NUMPAD_TIMES, //104 + KEY_EN_NUMPAD_2, //105 + KEY_EN_F9, //108 + KEY_EN_9, //109 + KEY_EN_O, //110 + KEY_EN_L, //111 + KEY_EN_COMMA, //112 + KEY_EN_MENU, //113 + KEY_EN_LEFT_ARROW, //115 + KEY_EN_NUMPAD_MINUS, //116 + KEY_EN_NUMPAD_3, //117 + KEY_EN_F10, //120 + KEY_EN_0, //121 + KEY_EN_P, //122 + KEY_EN_SEMICOLON, //123 + KEY_EN_PERIOD, //124 + KEY_EN_ANSI_ENTER, //126 + KEY_EN_DOWN_ARROW, //127 + KEY_EN_NUMPAD_PLUS, //128 + KEY_EN_NUMPAD_0, //129 + KEY_EN_F11, //132 + KEY_EN_MINUS, //133 + KEY_EN_LEFT_BRACKET, //134 + KEY_EN_QUOTE, //135 + KEY_EN_FORWARD_SLASH, //136 + "Key: Brightness", //137 + KEY_EN_RIGHT_ARROW, //139 + KEY_EN_NUMPAD_ENTER, //140 + KEY_EN_NUMPAD_PERIOD, //141 "Key: / (ISO)", - "Key: \\ (ISO)", + KEY_EN_ISO_BACK_SLASH, "Key: Macro G1", "Key: Macro G2", "Key: Macro G3", @@ -533,119 +534,119 @@ static const char* led_names_k95_plat[] = static const char* led_names_k95[] = { - "Key: Escape", //0 - "Key: `", //1 - "Key: Tab", //2 - "Key: Caps Lock", //3 - "Key: Left Shift", //4 - "Key: Left Control", //5 - "Key: F12", //6 - "Key: =", //7 - "Key: Lock", //8 - "Key: Number Pad 7", //9 - "Key: F1", //12 - "Key: 1", //13 - "Key: Q", //14 - "Key: A", //15 - "Key: Left Windows", //17 - "Key: Print Screen", //18 - "Key: Media Mute", //20 - "Key: Number Pad 8", //21 - "Key: F2", //24 - "Key: 2", //25 - "Key: W", //26 - "Key: S", //27 - "Key: Z", //28 - "Key: Left Alt", //29 - "Key: Scroll Lock", //30 - "Key: Backspace", //31 - "Key: Media Stop", //32 - "Key: Number Pad 9", //33 - "Key: F3", //36 - "Key: 3", //37 - "Key: E", //38 - "Key: D", //39 - "Key: X", //40 - "Key: Pause/Break", //42 - "Key: Delete", //43 - "Key: Media Previous", //44 - "Key: F4", //48 - "Key: 4", //49 - "Key: R", //50 - "Key: F", //51 - "Key: C", //52 - "Key: Space", //53 - "Key: Insert", //54 - "Key: End", //55 - "Key: Media Play/Pause",//56 - "Key: Number Pad 4", //57 - "Key: F5", //60 - "Key: 5", //61 - "Key: T", //62 - "Key: G", //63 - "Key: V", //64 - "Key: Home", //66 - "Key: Page Down", //67 - "Key: Media Next", //68 - "Key: Number Pad 5", //69 - "Key: F6", //72 - "Key: 6", //73 - "Key: Y", //74 - "Key: H", //75 - "Key: B", //76 - "Key: Page Up", //78 - "Key: Right Shift", //79 - "Key: Num Lock", //80 - "Key: Number Pad 6", //81 - "Key: F7", //84 - "Key: 7", //85 - "Key: U", //86 - "Key: J", //87 - "Key: N", //88 - "Key: Right Alt", //89 - "Key: ]", //90 - "Key: Right Control", //91 - "Key: Number Pad /", //92 - "Key: Number Pad 1", //93 - "Key: F8", //96 - "Key: 8", //97 - "Key: I", //98 - "Key: K", //99 - "Key: M", //100 - "Key: Right Windows", //101 - "Key: \\ (ANSI)", //102 - "Key: Up Arrow", //103 - "Key: Number Pad *", //104 - "Key: Number Pad 2", //105 - "Key: F9", //108 - "Key: 9", //109 - "Key: O", //110 - "Key: L", //111 - "Key: ,", //112 - "Key: Menu", //113 - "Key: Left Arrow", //115 - "Key: Number Pad -", //116 - "Key: Number Pad 3", //117 - "Key: F10", //120 - "Key: 0", //121 - "Key: P", //122 - "Key: ;", //123 - "Key: .", //124 - "Key: Enter", //126 - "Key: Down Arrow", //127 - "Key: Number Pad +", //128 - "Key: Number Pad 0", //129 - "Key: F11", //132 - "Key: -", //133 - "Key: [", //134 - "Key: '", //135 - "Key: /", //136 - "Key: Brightness", //137 - "Key: Right Arrow", //139 - "Key: Number Pad Enter",//140 - "Key: Number Pad .", //141 + KEY_EN_ESCAPE, //0 + KEY_EN_BACK_TICK, //1 + KEY_EN_TAB, //2 + KEY_EN_CAPS_LOCK, //3 + KEY_EN_LEFT_SHIFT, //4 + KEY_EN_LEFT_CONTROL, //5 + KEY_EN_F12, //6 + KEY_EN_EQUALS, //7 + "Key: Lock", //8 + KEY_EN_NUMPAD_7, //9 + KEY_EN_F1, //12 + KEY_EN_1, //13 + KEY_EN_Q, //14 + KEY_EN_A, //15 + KEY_EN_LEFT_WINDOWS, //17 + KEY_EN_PRINT_SCREEN, //18 + KEY_EN_MEDIA_MUTE, //20 + KEY_EN_NUMPAD_8, //21 + KEY_EN_F2, //24 + KEY_EN_2, //25 + KEY_EN_W, //26 + KEY_EN_S, //27 + KEY_EN_Z, //28 + KEY_EN_LEFT_ALT, //29 + KEY_EN_SCROLL_LOCK, //30 + KEY_EN_BACKSPACE, //31 + KEY_EN_MEDIA_STOP, //32 + KEY_EN_NUMPAD_9, //33 + KEY_EN_F3, //36 + KEY_EN_3, //37 + KEY_EN_E, //38 + KEY_EN_D, //39 + KEY_EN_X, //40 + KEY_EN_PAUSE_BREAK, //42 + KEY_EN_DELETE, //43 + KEY_EN_MEDIA_PREVIOUS, //44 + KEY_EN_F4, //48 + KEY_EN_4, //49 + KEY_EN_R, //50 + KEY_EN_F, //51 + KEY_EN_C, //52 + KEY_EN_SPACE, //53 + KEY_EN_INSERT, //54 + KEY_EN_END, //55 + KEY_EN_MEDIA_PLAY_PAUSE, //56 + KEY_EN_NUMPAD_4, //57 + KEY_EN_F5, //60 + KEY_EN_5, //61 + KEY_EN_T, //62 + KEY_EN_G, //63 + KEY_EN_V, //64 + KEY_EN_HOME, //66 + KEY_EN_PAGE_DOWN, //67 + KEY_EN_MEDIA_NEXT, //68 + KEY_EN_NUMPAD_5, //69 + KEY_EN_F6, //72 + KEY_EN_6, //73 + KEY_EN_Y, //74 + KEY_EN_H, //75 + KEY_EN_B, //76 + KEY_EN_PAGE_UP, //78 + KEY_EN_RIGHT_SHIFT, //79 + KEY_EN_NUMPAD_LOCK, //80 + KEY_EN_NUMPAD_6, //81 + KEY_EN_F7, //84 + KEY_EN_7, //85 + KEY_EN_U, //86 + KEY_EN_J, //87 + KEY_EN_N, //88 + KEY_EN_RIGHT_ALT, //89 + KEY_EN_RIGHT_BRACKET, //90 + KEY_EN_RIGHT_CONTROL, //91 + KEY_EN_NUMPAD_DIVIDE, //92 + KEY_EN_NUMPAD_1, //93 + KEY_EN_F8, //96 + KEY_EN_8, //97 + KEY_EN_I, //98 + KEY_EN_K, //99 + KEY_EN_M, //100 + KEY_EN_RIGHT_WINDOWS, //101 + KEY_EN_ANSI_BACK_SLASH, //102 + KEY_EN_UP_ARROW, //103 + KEY_EN_NUMPAD_TIMES, //104 + KEY_EN_NUMPAD_2, //105 + KEY_EN_F9, //108 + KEY_EN_9, //109 + KEY_EN_O, //110 + KEY_EN_L, //111 + KEY_EN_COMMA, //112 + KEY_EN_MENU, //113 + KEY_EN_LEFT_ARROW, //115 + KEY_EN_NUMPAD_MINUS, //116 + KEY_EN_NUMPAD_3, //117 + KEY_EN_F10, //120 + KEY_EN_0, //121 + KEY_EN_P, //122 + KEY_EN_SEMICOLON, //123 + KEY_EN_PERIOD, //124 + KEY_EN_ANSI_ENTER, //126 + KEY_EN_DOWN_ARROW, //127 + KEY_EN_NUMPAD_PLUS, //128 + KEY_EN_NUMPAD_0, //129 + KEY_EN_F11, //132 + KEY_EN_MINUS, //133 + KEY_EN_LEFT_BRACKET, //134 + KEY_EN_QUOTE, //135 + KEY_EN_FORWARD_SLASH, //136 + "Key: Brightness", //137 + KEY_EN_RIGHT_ARROW, //139 + KEY_EN_NUMPAD_ENTER, //140 + KEY_EN_NUMPAD_PERIOD, //141 "Key: / (ISO)", - "Key: \\ (ISO)", + KEY_EN_ISO_BACK_SLASH, "Key: Macro G1", "Key: Macro G2", "Key: Macro G3", diff --git a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp index d6313899..5ef15d01 100644 --- a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp +++ b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 5/8/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_CorsairWireless.h" using namespace std::chrono_literals; @@ -44,133 +45,133 @@ static const char* led_names[] = "Lock/Macro Indicator", "N/A", "N/A", - "Key: A", - "Key: B", - "Key: C", - "Key: D", - "Key: E", - "Key: F", - "Key: G", - "Key: H", - "Key: I", - "Key: J", - "Key: K", - "Key: L", - "Key: M", - "Key: N", - "Key: O", - "Key: P", - "Key: Q", - "Key: R", - "Key: S", - "Key: T", - "Key: U", - "Key: V", - "Key: W", - "Key: X", - "Key: Y", - "Key: Z", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: 7", - "Key: 8", - "Key: 9", - "Key: 0", - "Key: Enter", - "Key: Escape", - "Key: Backspace", - "Key: Tab", - "Key: Space", - "Key: -", - "Key: =", - "Key: [", - "Key: ]", - "Key: \\ (ANSI)", - "Unused", - "Key: ;", - "Key: '", - "Key: `", - "Key: ,", - "Key: .", - "Key: /", - "Key: Caps Lock", - "Key: F1", - "Key: F2", - "Key: F3", - "Key: F4", - "Key: F5", - "Key: F6", - "Key: F7", - "Key: F8", - "Key: F9", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Print Screen", - "Key: Scroll Lock", - "Key: Pause/Break", - "Key: Insert", - "Key: Home", - "Key: Page Up", - "Key: Delete", - "Key: End", - "Key: Page Down", - "Key: Right Arrow", - "Key: Left Arrow", - "Key: Down Arrow", - "Key: Up Arrow", - "Key: Num Lock", - "Key: Number Pad /", - "Key: Number Pad *", - "Key: Number Pad -", - "Key: Number Pad +", - "Key: Number Pad Enter", - "Key: Number Pad 1", - "Key: Number Pad 2", - "Key: Number Pad 3", - "Key: Number Pad 4", - "Key: Number Pad 5", - "Key: Number Pad 6", - "Key: Number Pad 7", - "Key: Number Pad 8", - "Key: Number Pad 9", - "Key: Number Pad 0", - "Key: Number Pad .", - "Unused", - "Key: Menu", - "Unused", - "Unused", - "Unused", - "Left Control", - "Left Shift", - "Left Alt", - "Left Windows", - "Right Control", - "Right Shift", - "Right Alt", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Key: Right Fn", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", + KEY_EN_A, + KEY_EN_B, + KEY_EN_C, + KEY_EN_D, + KEY_EN_E, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_I, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_M, + KEY_EN_N, + KEY_EN_O, + KEY_EN_P, + KEY_EN_Q, + KEY_EN_R, + KEY_EN_S, + KEY_EN_T, + KEY_EN_U, + KEY_EN_V, + KEY_EN_W, + KEY_EN_X, + KEY_EN_Y, + KEY_EN_Z, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_ANSI_ENTER, + KEY_EN_ESCAPE, + KEY_EN_BACKSPACE, + KEY_EN_TAB, + KEY_EN_SPACE, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_UNUSED, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_BACK_TICK, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_CAPS_LOCK, + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, + KEY_EN_PAUSE_BREAK, + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, + KEY_EN_RIGHT_ARROW, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_UP_ARROW, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_PERIOD, + KEY_EN_UNUSED, + KEY_EN_MENU, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_ALT, + KEY_EN_LEFT_WINDOWS, + KEY_EN_RIGHT_CONTROL, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_ALT, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, "Key: G1", "Key: G2", "Key: G3", diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp index b65cb84d..e5023727 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp +++ b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp @@ -7,6 +7,7 @@ | Frank Niessen (denk_mal) 12/16/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_DasKeyboard.h" using namespace std::chrono_literals; @@ -56,136 +57,136 @@ static const unsigned int zone_sizes[] = // UK Layout static const char *led_names[] = { - "Key: Left Control", - "Key: Left Shift", - "Key: Caps Lock", - "Key: Tab", - "Key: `", - "Key: Escape", - "Key: Left Windows", - "Key: \\ (ANSI)", - "Key: A", - "Key: Q", - "Key: 1", - "Undefined", - "Key: Left Alt", - "Key: Z", - "Key: S", - "Key: W", - "Key: 2", - "Key: F1", - "Undefined", - "Key: X", - "Key: D", - "Key: E", - "Key: 3", - "Key: F2", - "Undefined", - "Key: C", - "Key: F", - "Key: R", - "Key: 4", - "Key: F3", - "Undefined", - "Key: V", - "Key: G", - "Key: T", - "Key: 5", - "Key: F4", - "Key: Space", - "Key: B", - "Key: H", - "Key: Y", - "Key: 6", - "Key: F5", - "Undefined", - "Key: N", - "Key: J", - "Key: U", - "Key: 7", - "Key: F6", - "Undefined", - "Key: M", - "Key: K", - "Key: I", - "Key: 8", - "Key: F7", - "Undefined", - "Key: ,", - "Key: L", - "Key: O", - "Key: 9", - "Key: F8", - "Key: Right Alt", - "Key: .", - "Key: ;", - "Key: P", - "Key: 0", - "Key: F9", - "Key: Right Windows", - "Key: /", - "Key: '", - "Key: [", - "Key: -", - "Key: F10", - "Key: Menu", - "Undefined", - "Undefined", - "Key: ]", - "Key: =", - "Key: F11", - "Key: Right Control", - "Key: Right Shift", - "Key: Enter", - "Key: #", - "Key: Backspace", - "Key: F12", - "Key: Left Arrow", - "Undefined", - "Undefined", - "Key: Delete", - "Key: Insert", - "Key: Print Screen", - "Key: Down Arrow", - "Key: Up Arrow", - "Undefined", - "Key: End", - "Key: Home", - "Key: Scroll Lock", - "Key: Right Arrow", - "Undefined", - "Undefined", - "Key: Page Down", - "Key: Page Up", - "Key: Pause/Break", - "Key: Number Pad 0", - "Key: Number Pad 1", - "Key: Number Pad 4", - "Key: Number Pad 7", - "Key: Num Lock", - "Undefined", - "Undefined", - "Key: Number Pad 2", - "Key: Number Pad 5", - "Key: Number Pad 8", - "Key: Number Pad /", - "Undefined", - "Key: Number Pad .", - "Key: Number Pad 3", - "Key: Number Pad 6", - "Key: Number Pad 9", - "Key: Number Pad *", - "Undefined", - "Undefined", - "Undefined", - "Key: Number Pad Enter", - "Key: Number Pad +", - "Key: Number Pad -", - "Undefined", + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_SHIFT, + KEY_EN_CAPS_LOCK, + KEY_EN_TAB, + KEY_EN_BACK_TICK, + KEY_EN_ESCAPE, + KEY_EN_LEFT_WINDOWS, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_A, + KEY_EN_Q, + KEY_EN_1, + KEY_EN_UNUSED, + KEY_EN_LEFT_ALT, + KEY_EN_Z, + KEY_EN_S, + KEY_EN_W, + KEY_EN_2, + KEY_EN_F1, + KEY_EN_UNUSED, + KEY_EN_X, + KEY_EN_D, + KEY_EN_E, + KEY_EN_3, + KEY_EN_F2, + KEY_EN_UNUSED, + KEY_EN_C, + KEY_EN_F, + KEY_EN_R, + KEY_EN_4, + KEY_EN_F3, + KEY_EN_UNUSED, + KEY_EN_V, + KEY_EN_G, + KEY_EN_T, + KEY_EN_5, + KEY_EN_F4, + KEY_EN_SPACE, + KEY_EN_B, + KEY_EN_H, + KEY_EN_Y, + KEY_EN_6, + KEY_EN_F5, + KEY_EN_UNUSED, + KEY_EN_N, + KEY_EN_J, + KEY_EN_U, + KEY_EN_7, + KEY_EN_F6, + KEY_EN_UNUSED, + KEY_EN_M, + KEY_EN_K, + KEY_EN_I, + KEY_EN_8, + KEY_EN_F7, + KEY_EN_UNUSED, + KEY_EN_COMMA, + KEY_EN_L, + KEY_EN_O, + KEY_EN_9, + KEY_EN_F8, + KEY_EN_RIGHT_ALT, + KEY_EN_PERIOD, + KEY_EN_SEMICOLON, + KEY_EN_P, + KEY_EN_0, + KEY_EN_F9, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_FORWARD_SLASH, + KEY_EN_QUOTE, + KEY_EN_LEFT_BRACKET, + KEY_EN_MINUS, + KEY_EN_F10, + KEY_EN_MENU, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_BRACKET, + KEY_EN_EQUALS, + KEY_EN_F11, + KEY_EN_RIGHT_CONTROL, + KEY_EN_RIGHT_SHIFT, + KEY_EN_ANSI_ENTER, + KEY_EN_POUND, + KEY_EN_BACKSPACE, + KEY_EN_F12, + KEY_EN_LEFT_ARROW, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_DELETE, + KEY_EN_INSERT, + KEY_EN_PRINT_SCREEN, + KEY_EN_DOWN_ARROW, + KEY_EN_UP_ARROW, + KEY_EN_UNUSED, + KEY_EN_END, + KEY_EN_HOME, + KEY_EN_SCROLL_LOCK, + KEY_EN_RIGHT_ARROW, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_PAGE_DOWN, + KEY_EN_PAGE_UP, + KEY_EN_PAUSE_BREAK, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_LOCK, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_PERIOD, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_TIMES, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_MINUS, + KEY_EN_UNUSED, "Key: Sleep", "Key: Brightness", - "Key: Media Play/Pause", - "Key: Media Next", + KEY_EN_MEDIA_PLAY_PAUSE, + KEY_EN_MEDIA_NEXT, "Key: Q-Button" }; diff --git a/Controllers/DebugController/DebugControllerDetect.cpp b/Controllers/DebugController/DebugControllerDetect.cpp index 667f6a9f..98018c1d 100644 --- a/Controllers/DebugController/DebugControllerDetect.cpp +++ b/Controllers/DebugController/DebugControllerDetect.cpp @@ -2,6 +2,7 @@ #include "RGBController.h" #include "RGBController_Debug.h" #include "RGBController_Dummy.h" +#include "RGBControllerKeyNames.h" #include "SettingsManager.h" #include #include @@ -18,126 +19,126 @@ #define NA 0xFFFFFFFF static unsigned int debug_keyboard_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, 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 } }; + { { 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, 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 unsigned int dummy_keyboard_underglow_map[3][10] = - { { 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 }, - { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }, - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } }; + { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, + { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }, + { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } }; 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: Menu", - "Key: Enter (ISO)", - "Key: Left Arrow", - "Key: F1", - "Key: 1", - "Key: Q", - "Key: A", - "Key: \\ (ISO)", - "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: \\ (ANSI)", - "Key: Up Arrow", - "Key: Number Pad 5", - "Key: Number Pad Enter", - "Key: Number Pad .", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_F12, + KEY_EN_EQUALS, + KEY_EN_F9, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_COMMA, + KEY_EN_MENU, + KEY_EN_ISO_ENTER, + KEY_EN_LEFT_ARROW, + KEY_EN_F1, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_LEFT_WINDOWS, + KEY_EN_PRINT_SCREEN, + KEY_EN_F10, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_PERIOD, + KEY_EN_ANSI_ENTER, + KEY_EN_DOWN_ARROW, + KEY_EN_F2, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_Z, + KEY_EN_LEFT_ALT, + KEY_EN_SCROLL_LOCK, + KEY_EN_BACKSPACE, + KEY_EN_F11, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_ARROW, + KEY_EN_F3, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_X, + KEY_EN_PAUSE_BREAK, + KEY_EN_DELETE, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_6, + KEY_EN_F4, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_C, + KEY_EN_SPACE, + KEY_EN_INSERT, + KEY_EN_END, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_1, + KEY_EN_F5, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_V, + KEY_EN_HOME, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_2, + KEY_EN_F6, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_B, + KEY_EN_PAGE_UP, + KEY_EN_RIGHT_SHIFT, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_3, + KEY_EN_F7, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_N, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_BRACKET, + KEY_EN_RIGHT_CONTROL, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_0, + KEY_EN_F8, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_M, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_UP_ARROW, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_PERIOD, "RGB Strip 1", "RGB Strip 2", "RGB Strip 3", @@ -156,10 +157,10 @@ static const char *led_names[] = "RGB Strip 16", "RGB Strip 17", "RGB Strip 18", - "Key: Media Previous", - "Key: Media Play/Pause", - "Key: Media Next", - "Key: Media Mute", + KEY_EN_MEDIA_PREVIOUS, + KEY_EN_MEDIA_PLAY_PAUSE, + KEY_EN_MEDIA_NEXT, + KEY_EN_MEDIA_MUTE, "Underglow LED 1", "Underglow LED 2", "Underglow LED 3", diff --git a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp index 2bc43df7..5a74c7de 100644 --- a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp +++ b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 7/4/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_DuckyKeyboard.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -51,138 +52,138 @@ static const unsigned int zone_sizes_tkl[] = static const char *led_names[] = { - "Key: Escape", - "Key: `", - "Key: Tab", - "Key: Caps Lock", - "Key: Left Shift", - "Key: Left Control", - "Unused", - "Key: 1", - "Key: Q", - "Key: A", - "Key: \\ (ISO)", - "Key: Left Windows", - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: Z", - "Key: Left Alt", - "Key: F2", - "Key: 3", - "Key: E", - "Key: D", - "Key: X", - "Unused", - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: C", - "Unused", - "Key: F4", - "Key: 5", - "Key: T", - "Key: G", - "Key: V", - "Unused", - "Unused", - "Key: 6", - "Key: Y", - "Key: H", - "Key: B", - "Key: Space", - "Key: F5", - "Key: 7", - "Key: U", - "Key: J", - "Key: N", - "Unused", - "Key: F6", - "Key: 8", - "Key: I", - "Key: K", - "Key: M", - "Unused", - "Key: F7", - "Key: 9", - "Key: O", - "Key: L", - "Key: ,", - "Unused", - "Key: F8", - "Key: 0", - "Key: P", - "Key: ;", - "Key: .", - "Key: Right Alt", - "Key: F9", - "Key: -", - "Key: [", - "Key: '", - "Key: /", - "Unused", - "Key: F10", - "Key: =", - "Key: ]", - "Key: #", - "Unused", - "Key: Right Windows", - "Key: F11", - "Unused", - "Unused", - "Unused", - "Key: Right Shift", - "Key: Right Fn", - "Key: F12", - "Key: Backspace", - "Key: \\ (ANSI)", - "Key: Enter", - "Unused", - "Key: Right Control", - "Key: Print Screen", - "Key: Insert", - "Key: Delete", - "Unused", - "Unused", - "Key: Left Arrow", - "Key: Scroll Lock", - "Key: Home", - "Key: End", - "Unused", - "Key: Up Arrow", - "Key: Down Arrow", - "Key: Pause/Break", - "Key: Page Up", - "Key: Page Down", - "Unused", - "Unused", - "Key: Right Arrow", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_UNUSED, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_LEFT_WINDOWS, + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_Z, + KEY_EN_LEFT_ALT, + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_X, + KEY_EN_UNUSED, + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_C, + KEY_EN_UNUSED, + KEY_EN_F4, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_V, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_B, + KEY_EN_SPACE, + KEY_EN_F5, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_N, + KEY_EN_UNUSED, + KEY_EN_F6, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_M, + KEY_EN_UNUSED, + KEY_EN_F7, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_COMMA, + KEY_EN_UNUSED, + KEY_EN_F8, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_PERIOD, + KEY_EN_RIGHT_ALT, + KEY_EN_F9, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_FORWARD_SLASH, + KEY_EN_UNUSED, + KEY_EN_F10, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_POUND, + KEY_EN_UNUSED, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_F11, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_F12, + KEY_EN_BACKSPACE, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_ANSI_ENTER, + KEY_EN_UNUSED, + KEY_EN_RIGHT_CONTROL, + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_ARROW, + KEY_EN_SCROLL_LOCK, + KEY_EN_HOME, + KEY_EN_END, + KEY_EN_UNUSED, + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_PAUSE_BREAK, + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_ARROW, "Key: Calculator", - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Key: Number Pad 0", - "Key: Media Mute", - "Key: Number Pad /", - "Key: Number Pad 8", - "Key: Number Pad 5", - "Key: Number Pad 2", - "Unused", - "Key: Media Volume Down", - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", - "Key: Number Pad .", - "Key: Media Volume Up", - "Key: Number Pad -", - "Key: Number Pad +", - "Unused", - "Unused", - "Key: Number Pad Enter", + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_0, + KEY_EN_MEDIA_MUTE, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, + KEY_EN_UNUSED, + KEY_EN_MEDIA_VOLUME_DOWN, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_PERIOD, + KEY_EN_MEDIA_VOLUME_UP, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_ENTER, }; RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController* controller_ptr) diff --git a/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp b/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp index 5e7b8f3b..9262ef6b 100644 --- a/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp +++ b/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp @@ -6,6 +6,7 @@ | Timo Schlegel (@eispalast) 12/12/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_DygmaRaise.h" #define NA 0xFFFFFFFF @@ -21,17 +22,17 @@ static unsigned int kb_matrix_map_ISO[6][14] = { NA, NA, NA, NA, 31, 32, NA, 68, 67, NA, NA, NA, NA, NA } }; static unsigned int underglow_matrix[11][14] = - { { 2, 3 , 4, 5 , 6 , 7, NA, 38, 37, 36, 35, 34, 33, 32}, - { 1, NA, NA, NA, NA, 8, NA, 39, NA, NA, NA, NA, NA, 31 }, - { 0, NA, NA, NA, NA, 9, NA, 40, NA, NA, NA, NA, NA, 30 }, - { 29, NA, NA, NA, NA, 10,NA, 41, NA, NA, NA, NA, NA, 61 }, - { 28, NA, NA, NA, NA, 11,NA, 42, NA, NA, NA, NA, NA, 60 }, - { 27, NA, NA, NA, NA, 12,NA, 43, NA, NA, NA, NA, NA, 59 }, - { 26, NA, NA, NA, NA, 13,NA, 44, NA, NA, NA, NA, NA, 58 }, - { 25, NA, NA, NA, NA, 14,NA, 45, NA, NA, NA, NA, NA, 57 }, - { 24, NA, NA, NA, NA, 15,NA, 46, NA, NA, NA, NA, NA, 56 }, - { 23, NA, NA, NA, NA, 16,NA, 47, NA, NA, NA, NA, NA, 55 }, - { 22, 21, 20, 19, 18, 17,NA, 48,49,50,51,52,53, 54, }}; + { { 2, 3, 4, 5, 6, 7, NA, 38, 37, 36, 35, 34, 33, 32 }, + { 1, NA, NA, NA, NA, 8, NA, 39, NA, NA, NA, NA, NA, 31 }, + { 0, NA, NA, NA, NA, 9, NA, 40, NA, NA, NA, NA, NA, 30 }, + { 29, NA, NA, NA, NA, 10, NA, 41, NA, NA, NA, NA, NA, 61 }, + { 28, NA, NA, NA, NA, 11, NA, 42, NA, NA, NA, NA, NA, 60 }, + { 27, NA, NA, NA, NA, 12, NA, 43, NA, NA, NA, NA, NA, 59 }, + { 26, NA, NA, NA, NA, 13, NA, 44, NA, NA, NA, NA, NA, 58 }, + { 25, NA, NA, NA, NA, 14, NA, 45, NA, NA, NA, NA, NA, 57 }, + { 24, NA, NA, NA, NA, 15, NA, 46, NA, NA, NA, NA, NA, 56 }, + { 23, NA, NA, NA, NA, 16, NA, 47, NA, NA, NA, NA, NA, 55 }, + { 22, 21, 20, 19, 18, 17, NA, 48, 49, 50, 51, 52, 53, 54, } }; static const char* zone_names[] = @@ -57,71 +58,71 @@ static const unsigned int zone_sizes[] = static const char* led_names[] = { - "Key: Escape", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: Tab", - "Key: Q", - "Key: W", - "Key: E", - "Key: R", - "Key: T", - "Key: Caps Lock", - "Key: A", - "Key: S", - "Key: D", - "Key: F", - "Key: G", - "Key: Left Shift", - "Key: \\ (ISO)", - "Key: Z", - "Key: X", - "Key: C", - "Key: V", - "Key: B", - "Key: Left Control", - "Key: Left Windows", - "Key: Left Alt", + KEY_EN_ESCAPE, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_TAB, + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_CAPS_LOCK, + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_LEFT_SHIFT, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, "Key: T1", "Key: T2", "Key: T3", "Key: T4", - "Key: Backspace", - "Key: =", - "Key: -", - "Key: 0", - "Key: 9", - "Key: 8", - "Key: 7", - "Key: Enter", - "Key: ]", - "Key: [", - "Key: P", - "Key: O", - "Key: I", - "Key: U", - "Key: Y", - "Key: #", - "Key: '", - "Key: ;", - "Key: L", - "Key: K", - "Key: J", - "Key: H", - "Key: Right Shift", - "Key: /", - "Key: .", - "Key: ,", - "Key: M", - "Key: N", - "Key: Right Control", - "Key: Right Windows", - "Key: Right Fn", - "Key: Right Alt", + KEY_EN_BACKSPACE, + KEY_EN_EQUALS, + KEY_EN_MINUS, + KEY_EN_0, + KEY_EN_9, + KEY_EN_8, + KEY_EN_7, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_BRACKET, + KEY_EN_LEFT_BRACKET, + KEY_EN_P, + KEY_EN_O, + KEY_EN_I, + KEY_EN_U, + KEY_EN_Y, + KEY_EN_POUND, + KEY_EN_QUOTE, + KEY_EN_SEMICOLON, + KEY_EN_L, + KEY_EN_K, + KEY_EN_J, + KEY_EN_H, + KEY_EN_RIGHT_SHIFT, + KEY_EN_FORWARD_SLASH, + KEY_EN_PERIOD, + KEY_EN_COMMA, + KEY_EN_M, + KEY_EN_N, + KEY_EN_RIGHT_CONTROL, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_RIGHT_ALT, "Key: T6", "Key: T5", "Key: T8", diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp index e7b51c97..91833dc2 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 2/2/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_HyperXAlloyElite.h" using namespace std::chrono_literals; @@ -45,112 +46,112 @@ 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: Menu", - "Key: Enter (ISO)", - "Key: Left Arrow", - "Key: F1", - "Key: 1", - "Key: Q", - "Key: A", - "Key: \\ (ISO)", - "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: \\ (ANSI)", - "Key: Up Arrow", - "Key: Number Pad 5", - "Key: Number Pad Enter", - "Key: Number Pad .", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_F12, + KEY_EN_EQUALS, + KEY_EN_F9, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_COMMA, + KEY_EN_MENU, + KEY_EN_ISO_ENTER, + KEY_EN_LEFT_ARROW, + KEY_EN_F1, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_LEFT_WINDOWS, + KEY_EN_PRINT_SCREEN, + KEY_EN_F10, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_PERIOD, + KEY_EN_ANSI_ENTER, + KEY_EN_DOWN_ARROW, + KEY_EN_F2, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_Z, + KEY_EN_LEFT_ALT, + KEY_EN_SCROLL_LOCK, + KEY_EN_BACKSPACE, + KEY_EN_F11, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_ARROW, + KEY_EN_F3, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_X, + KEY_EN_PAUSE_BREAK, + KEY_EN_DELETE, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_6, + KEY_EN_F4, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_C, + KEY_EN_SPACE, + KEY_EN_INSERT, + KEY_EN_END, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_1, + KEY_EN_F5, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_V, + KEY_EN_HOME, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_2, + KEY_EN_F6, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_B, + KEY_EN_PAGE_UP, + KEY_EN_RIGHT_SHIFT, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_3, + KEY_EN_F7, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_N, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_BRACKET, + KEY_EN_RIGHT_CONTROL, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_0, + KEY_EN_F8, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_M, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_UP_ARROW, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_PERIOD, "RGB Strip 1", "RGB Strip 2", "RGB Strip 3", @@ -169,10 +170,10 @@ static const char *led_names[] = "RGB Strip 16", "RGB Strip 17", "RGB Strip 18", - "Key: Media Previous", - "Key: Media Play/Pause", - "Key: Media Next", - "Key: Media Mute" + KEY_EN_MEDIA_PREVIOUS, + KEY_EN_MEDIA_PLAY_PAUSE, + KEY_EN_MEDIA_NEXT, + KEY_EN_MEDIA_MUTE }; RGBController_HyperXAlloyElite::RGBController_HyperXAlloyElite(HyperXAlloyEliteController* controller_ptr) diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp index a896fde0..83731678 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp @@ -7,6 +7,7 @@ | KundaPanda (vojdo) 02/04/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_HyperXAlloyElite2.h" using namespace std::chrono_literals; @@ -47,131 +48,131 @@ 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: \\ (ISO)", - "Key: 1", - "Key: Q", - "Key: A", - "Key: Z", - "Key: Left Windows", - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: X", - "Key: Left Alt", - "Key: F2", - "Key: 3", - "Key: E", - "Key: D", - "Key: C", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_Z, + KEY_EN_LEFT_WINDOWS, + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_X, + KEY_EN_LEFT_ALT, + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_C, // Skip index 23 - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: V", + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_V, // Skip index 29 - "Key: F4", - "Key: 5", - "Key: T", - "Key: G", - "Key: B", - "Key: Space", - "Key: F5", - "Key: 6", - "Key: Y", - "Key: H", - "Key: N", + KEY_EN_F4, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_B, + KEY_EN_SPACE, + KEY_EN_F5, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_N, // Skip index 41 - "Key: F6", - "Key: 7", - "Key: U", - "Key: J", - "Key: M", + KEY_EN_F6, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_M, // Skip index 47 - "Key: F7", - "Key: 8", - "Key: I", - "Key: K", - "Key: ,", - "Key: Right Alt", - "Key: F8", - "Key: 9", - "Key: O", - "Key: L", - "Key: .", - "Key: Menu", - "Key: F9", - "Key: 0", - "Key: P", - "Key: ;", - "Key: /", - "Key: Right Windows", - "Key: F10", - "Key: -", - "Key: [", - "Key: '", + KEY_EN_F7, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_COMMA, + KEY_EN_RIGHT_ALT, + KEY_EN_F8, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_PERIOD, + KEY_EN_MENU, + KEY_EN_F9, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_F10, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, // Skip index 70 // Skip index 71 - "Key: F11", - "Key: =", - "Key: ]", - "Key: #", + KEY_EN_F11, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_POUND, // Skip index 76 - "Key: F12", - "Key: Backspace", - "Key: \\ (ANSI)", - "Key: Enter", - "Key: Right Shift", - "Key: Right Control", - "Key: Print Screen", - "Key: Insert", - "Key: Delete", + KEY_EN_F12, + KEY_EN_BACKSPACE, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_CONTROL, + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, // Skip index 87 // Skip index 88 - "Key: Left Arrow", - "Key: Scroll Lock", - "Key: Home", - "Key: End", + KEY_EN_LEFT_ARROW, + KEY_EN_SCROLL_LOCK, + KEY_EN_HOME, + KEY_EN_END, // Skip index 93 - "Key: Up Arrow", - "Key: Down Arrow", - "Key: Pause/Break", - "Key: Page Up", - "Key: Page Down", + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_PAUSE_BREAK, + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, // Skip index 99 // Skip index 100 - "Key: Right Arrow", + KEY_EN_RIGHT_ARROW, // Skip index 102 - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Key: Number Pad 0", + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_0, // Skip index 108 - "Key: Number Pad /", - "Key: Number Pad 8", - "Key: Number Pad 5", - "Key: Number Pad 2", + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, // Skip index 113 - "Key: Media Mute", // Last multimedia key - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", - "Key: Number Pad .", - "Key: Media Previous", // First multimedia key - "Key: Number Pad -", - "Key: Number Pad +", - "Key: Media Play/Pause", // Second multimedia key - "Key: Media Next", // Third multimedia key - "Key: Number Pad Enter", + KEY_EN_MEDIA_MUTE, // Last multimedia key + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_PERIOD, + KEY_EN_MEDIA_PREVIOUS, // First multimedia key + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_MEDIA_PLAY_PAUSE, // Second multimedia key + KEY_EN_MEDIA_NEXT, // Third multimedia key + KEY_EN_NUMPAD_ENTER, "RGB Strip 1", "RGB Strip 2", "RGB Strip 3", diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp index d5859a7c..88e2bd11 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 2/2/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_HyperXAlloyFPS.h" using namespace std::chrono_literals; @@ -39,112 +40,112 @@ 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: Menu", - "Key: Enter (ISO)", - "Key: Left Arrow", - "Key: F1", - "Key: 1", - "Key: Q", - "Key: A", - "Key: \\ (ISO)", - "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: \\ (ANSI)", - "Key: Up Arrow", - "Key: Number Pad 5", - "Key: Number Pad Enter", - "Key: Number Pad ." + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_F12, + KEY_EN_EQUALS, + KEY_EN_F9, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_COMMA, + KEY_EN_MENU, + KEY_EN_ISO_ENTER, + KEY_EN_LEFT_ARROW, + KEY_EN_F1, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_LEFT_WINDOWS, + KEY_EN_PRINT_SCREEN, + KEY_EN_F10, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_PERIOD, + KEY_EN_ANSI_ENTER, + KEY_EN_DOWN_ARROW, + KEY_EN_F2, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_Z, + KEY_EN_LEFT_ALT, + KEY_EN_SCROLL_LOCK, + KEY_EN_BACKSPACE, + KEY_EN_F11, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_ARROW, + KEY_EN_F3, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_X, + KEY_EN_PAUSE_BREAK, + KEY_EN_DELETE, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_6, + KEY_EN_F4, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_C, + KEY_EN_SPACE, + KEY_EN_INSERT, + KEY_EN_END, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_1, + KEY_EN_F5, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_V, + KEY_EN_HOME, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_2, + KEY_EN_F6, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_B, + KEY_EN_PAGE_UP, + KEY_EN_RIGHT_SHIFT, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_3, + KEY_EN_F7, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_N, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_BRACKET, + KEY_EN_RIGHT_CONTROL, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_0, + KEY_EN_F8, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_M, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_UP_ARROW, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_PERIOD }; RGBController_HyperXAlloyFPS::RGBController_HyperXAlloyFPS(HyperXAlloyFPSController* controller_ptr) diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp index 9df27ac9..33198056 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 7/11/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_HyperXAlloyOrigins.h" using namespace std::chrono_literals; @@ -39,132 +40,132 @@ 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: \\ (ISO)", - "Key: 1", - "Key: Q", - "Key: A", - "Key: Z", - "Key: Left Windows", - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: X", - "Key: Left Alt", - "Key: F2", - "Key: 3", - "Key: E", - "Key: D", - "Key: C", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_Z, + KEY_EN_LEFT_WINDOWS, + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_X, + KEY_EN_LEFT_ALT, + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_C, // Skip index 23 - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: V", + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_V, // Skip index 29 - "Key: F4", - "Key: 5", - "Key: T", - "Key: G", - "Key: B", - "Key: Space", - "Key: F5", - "Key: 6", - "Key: Y", - "Key: H", - "Key: N", + KEY_EN_F4, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_B, + KEY_EN_SPACE, + KEY_EN_F5, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_N, // Skip index 41 - "Key: F6", - "Key: 7", - "Key: U", - "Key: J", - "Key: M", + KEY_EN_F6, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_M, // Skip index 47 - "Key: F7", - "Key: 8", - "Key: I", - "Key: K", - "Key: ,", - "Key: Right Alt", - "Key: F8", - "Key: 9", - "Key: O", - "Key: L", - "Key: .", + KEY_EN_F7, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_COMMA, + KEY_EN_RIGHT_ALT, + KEY_EN_F8, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_PERIOD, // Skip index 59 - "Key: F9", - "Key: 0", - "Key: P", - "Key: ;", - "Key: /", - "Key: Right Fn", - "Key: F10", - "Key: -", - "Key: [", - "Key: '", + KEY_EN_F9, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_F10, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, // Skip index 70 // Skip index 71 - "Key: F11", - "Key: =", - "Key: ]", - "Key: #", + KEY_EN_F11, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_POUND, "Key: / (ABNT)", - "Key: Menu", - "Key: F12", - "Key: Backspace", - "Key: \\ (ANSI)", - "Key: Enter", - "Key: Right Shift", - "Key: Right Control", - "Key: Print Screen", - "Key: Insert", - "Key: Delete", + KEY_EN_MENU, + KEY_EN_F12, + KEY_EN_BACKSPACE, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_CONTROL, + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, // Skip index 87 // Skip index 88 - "Key: Left Arrow", - "Key: Scroll Lock", - "Key: Home", - "Key: End", + KEY_EN_LEFT_ARROW, + KEY_EN_SCROLL_LOCK, + KEY_EN_HOME, + KEY_EN_END, // Skip index 93 - "Key: Up Arrow", - "Key: Down Arrow", - "Key: Pause/Break", - "Key: Page Up", - "Key: Page Down", + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_PAUSE_BREAK, + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, // Skip index 99 // Skip index 100 - "Key: Right Arrow", + KEY_EN_RIGHT_ARROW, // Skip index 102 - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Key: Number Pad 0", + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_0, // Skip index 108 - "Key: Number Pad /", - "Key: Number Pad 8", - "Key: Number Pad 5", - "Key: Number Pad 2", + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, // Skip index 113 // Skip index 114 - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", - "Key: Number Pad .", + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_PERIOD, // Skip index 120 - "Key: Number Pad -", - "Key: Number Pad +", + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, // Skip index 123 // Skip index 124 - "Key: Number Pad Enter", + KEY_EN_NUMPAD_ENTER, }; RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOriginsController* controller_ptr) diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp index e186a246..814ac134 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp @@ -7,6 +7,7 @@ | Volodymyr Nazarchuk (Vavooon) 4/28/2021 | \*------------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_HyperXAlloyOriginsCore.h" using namespace std::chrono_literals; @@ -41,108 +42,108 @@ static const unsigned int zone_sizes[] = static const char *led_names[] = { - "Key: Escape", - "Key: F1", - "Key: F2", - "Key: F3", - "Key: F4", - "Key: F5", - "Key: F6", - "Key: F7", + KEY_EN_ESCAPE, + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, - "Key: `", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: 7", - "Key: 8", + KEY_EN_BACK_TICK, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, - "Key: Tab", - "Key: Q", - "Key: W", - "Key: E", - "Key: R", - "Key: T", - "Key: Y", - "Key: U", + KEY_EN_TAB, + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_Y, + KEY_EN_U, - "Key: Caps Lock", - "Key: A", - "Key: S", - "Key: D", - "Key: F", - "Key: G", - "Key: H", - "Key: J", + KEY_EN_CAPS_LOCK, + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_J, - "Key: Left Shift", - "Key: Z", - "Key: X", - "Key: C", - "Key: V", - "Key: B", - "Key: N", + KEY_EN_LEFT_SHIFT, + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_N, - "Key: Left Control", - "Key: Left Windows", - "Key: Left Alt", - "Key: Space", + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, + KEY_EN_SPACE, // End of first section - "Key: F8", - "Key: F9", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Print Screen", - "Key: Scroll Lock", - "Key: Pause/Break", + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, + KEY_EN_PAUSE_BREAK, - "Key: 9", - "Key: 0", - "Key: -", - "Key: =", - "Key: Backspace", - "Key: Insert", - "Key: Home", - "Key: Page Up", + KEY_EN_9, + KEY_EN_0, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_BACKSPACE, + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, - "Key: I", - "Key: O", - "Key: P", - "Key: [", - "Key: ]", - "Key: \\ (ANSI)", - "Key: Delete", - "Key: End", - "Key: Page Down", + KEY_EN_I, + KEY_EN_O, + KEY_EN_P, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, - "Key: K", - "Key: L", - "Key: ;", - "Key: '", - "Key: Enter", + KEY_EN_K, + KEY_EN_L, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_ANSI_ENTER, - "Key: M", - "Key: ,", - "Key: .", - "Key: /", - "Key: Right Shift", - "Key: Up Arrow", - "Key: Right Alt", - "Key: Right Fn", - "Key: Menu", - "Key: Right Control", - "Key: Left Arrow", - "Key: Down Arrow", - "Key: Right Arrow" + KEY_EN_M, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_SHIFT, + KEY_EN_UP_ARROW, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_MENU, + KEY_EN_RIGHT_CONTROL, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_RIGHT_ARROW }; RGBController_HyperXAlloyOriginsCore::RGBController_HyperXAlloyOriginsCore(HyperXAlloyOriginsCoreController* controller_ptr) diff --git a/Controllers/LogitechController/RGBController_LogitechG810.cpp b/Controllers/LogitechController/RGBController_LogitechG810.cpp index 03832a5e..a5a9492c 100644 --- a/Controllers/LogitechController/RGBController_LogitechG810.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG810.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 6/12/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_LogitechG810.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -46,117 +47,117 @@ typedef struct static const led_type led_names[] = { /* Key Label Zone, Index */ - { "Key: A", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x04 }, - { "Key: B", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x05 }, - { "Key: C", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x06 }, - { "Key: D", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x07 }, - { "Key: E", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x08 }, - { "Key: F", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x09 }, - { "Key: G", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0A }, - { "Key: H", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0B }, - { "Key: I", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0C }, - { "Key: J", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0D }, - { "Key: K", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0E }, - { "Key: L", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0F }, - { "Key: M", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x10 }, - { "Key: N", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x11 }, - { "Key: O", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x12 }, - { "Key: P", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x13 }, - { "Key: Q", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x14 }, - { "Key: R", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x15 }, - { "Key: S", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x16 }, - { "Key: T", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x17 }, - { "Key: U", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x18 }, - { "Key: V", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x19 }, - { "Key: W", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1A }, - { "Key: X", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1B }, - { "Key: Y", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1C }, - { "Key: Z", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1D }, - { "Key: 1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1E }, - { "Key: 2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1F }, - { "Key: 3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x20 }, - { "Key: 4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x21 }, - { "Key: 5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x22 }, - { "Key: 6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x23 }, - { "Key: 7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x24 }, - { "Key: 8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x25 }, - { "Key: 9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x26 }, - { "Key: 0", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x27 }, - { "Key: Enter", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x28 }, - { "Key: Escape", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x29 }, - { "Key: Backspace", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2A }, - { "Key: Tab", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2B }, - { "Key: Space", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2C }, - { "Key: -", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2D }, - { "Key: =", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2E }, - { "Key: [", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2F }, - { "Key: ]", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x30 }, - { "Key: \\ (ANSI)", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only - { "Key: #", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only - { "Key: ;", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x33 }, - { "Key: '", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x34 }, - { "Key: `", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x35 }, - { "Key: ,", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x36 }, - { "Key: .", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x37 }, - { "Key: /", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x38 }, - { "Key: Caps Lock", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x39 }, - { "Key: F1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3A }, - { "Key: F2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3B }, - { "Key: F3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3C }, - { "Key: F4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3D }, - { "Key: F5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3E }, - { "Key: F6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3F }, - { "Key: F7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x40 }, - { "Key: F8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x41 }, - { "Key: F9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x42 }, - { "Key: F10", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x43 }, - { "Key: F11", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x44 }, - { "Key: F12", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x45 }, - { "Key: Print Screen", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x46 }, - { "Key: Scroll Lock", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x47 }, - { "Key: Pause/Break", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x48 }, - { "Key: Insert", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x49 }, - { "Key: Home", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4A }, - { "Key: Page Up", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4B }, - { "Key: Delete", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4C }, - { "Key: End", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4D }, - { "Key: Page Down", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4E }, - { "Key: Right Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4F }, - { "Key: Left Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x50 }, - { "Key: Down Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x51 }, - { "Key: Up Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x52 }, - { "Key: Num Lock", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x53 }, - { "Key: Number Pad /", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x54 }, - { "Key: Number Pad *", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x55 }, - { "Key: Number Pad -", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x56 }, - { "Key: Number Pad +", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x57 }, - { "Key: Number Pad Enter", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x58 }, - { "Key: Number Pad 1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x59 }, - { "Key: Number Pad 2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5A }, - { "Key: Number Pad 3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5B }, - { "Key: Number Pad 4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5C }, - { "Key: Number Pad 5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5D }, - { "Key: Number Pad 6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5E }, - { "Key: Number Pad 7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5F }, - { "Key: Number Pad 8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x60 }, - { "Key: Number Pad 9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x61 }, - { "Key: Number Pad 0", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x62 }, - { "Key: Number Pad .", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x63 }, - { "Key: \\ (ISO)", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only - { "Key: Menu", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x65 }, - { "Key: Left Control", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE0 }, - { "Key: Left Shift", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE1 }, - { "Key: Left Alt", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE2 }, - { "Key: Left Windows", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE3 }, - { "Key: Right Control", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE4 }, - { "Key: Right Shift", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE5 }, - { "Key: Right Alt", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE6 }, - { "Key: Right Windows", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE7 }, - { "Key: Media Next", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB5 }, - { "Key: Media Previous", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB6 }, - { "Key: Media Stop", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB7 }, - { "Key: Media Play/Pause", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xCD }, - { "Key: Media Mute", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xE2 }, + { KEY_EN_A, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x04 }, + { KEY_EN_B, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x05 }, + { KEY_EN_C, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x06 }, + { KEY_EN_D, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x07 }, + { KEY_EN_E, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x08 }, + { KEY_EN_F, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x09 }, + { KEY_EN_G, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0A }, + { KEY_EN_H, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0B }, + { KEY_EN_I, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0C }, + { KEY_EN_J, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0D }, + { KEY_EN_K, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0E }, + { KEY_EN_L, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0F }, + { KEY_EN_M, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x10 }, + { KEY_EN_N, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x11 }, + { KEY_EN_O, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x12 }, + { KEY_EN_P, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x13 }, + { KEY_EN_Q, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x14 }, + { KEY_EN_R, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x15 }, + { KEY_EN_S, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x16 }, + { KEY_EN_T, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x17 }, + { KEY_EN_U, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x18 }, + { KEY_EN_V, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x19 }, + { KEY_EN_W, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1A }, + { KEY_EN_X, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1B }, + { KEY_EN_Y, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1C }, + { KEY_EN_Z, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1D }, + { KEY_EN_1, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1E }, + { KEY_EN_2, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1F }, + { KEY_EN_3, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x20 }, + { KEY_EN_4, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x21 }, + { KEY_EN_5, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x22 }, + { KEY_EN_6, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x23 }, + { KEY_EN_7, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x24 }, + { KEY_EN_8, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x25 }, + { KEY_EN_9, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x26 }, + { KEY_EN_0, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x27 }, + { KEY_EN_ANSI_ENTER, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x28 }, + { KEY_EN_ESCAPE, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x29 }, + { KEY_EN_BACKSPACE, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2A }, + { KEY_EN_TAB, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2B }, + { KEY_EN_SPACE, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2C }, + { KEY_EN_MINUS, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2D }, + { KEY_EN_EQUALS, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2E }, + { KEY_EN_LEFT_BRACKET, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2F }, + { KEY_EN_RIGHT_BRACKET, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x30 }, + { KEY_EN_ANSI_BACK_SLASH, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only + { KEY_EN_POUND, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only + { KEY_EN_SEMICOLON, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x33 }, + { KEY_EN_QUOTE, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x34 }, + { KEY_EN_BACK_TICK, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x35 }, + { KEY_EN_COMMA, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x36 }, + { KEY_EN_PERIOD, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x37 }, + { KEY_EN_FORWARD_SLASH, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x38 }, + { KEY_EN_CAPS_LOCK, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x39 }, + { KEY_EN_F1, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3A }, + { KEY_EN_F2, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3B }, + { KEY_EN_F3, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3C }, + { KEY_EN_F4, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3D }, + { KEY_EN_F5, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3E }, + { KEY_EN_F6, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3F }, + { KEY_EN_F7, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x40 }, + { KEY_EN_F8, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x41 }, + { KEY_EN_F9, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x42 }, + { KEY_EN_F10, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x43 }, + { KEY_EN_F11, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x44 }, + { KEY_EN_F12, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x45 }, + { KEY_EN_PRINT_SCREEN, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x46 }, + { KEY_EN_SCROLL_LOCK, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x47 }, + { KEY_EN_PAUSE_BREAK, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x48 }, + { KEY_EN_INSERT, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x49 }, + { KEY_EN_HOME, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4A }, + { KEY_EN_PAGE_UP, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4B }, + { KEY_EN_DELETE, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4C }, + { KEY_EN_END, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4D }, + { KEY_EN_PAGE_DOWN, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4E }, + { KEY_EN_RIGHT_ARROW, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4F }, + { KEY_EN_LEFT_ARROW, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x50 }, + { KEY_EN_DOWN_ARROW, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x51 }, + { KEY_EN_UP_ARROW, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x52 }, + { KEY_EN_NUMPAD_LOCK, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x53 }, + { KEY_EN_NUMPAD_DIVIDE, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x54 }, + { KEY_EN_NUMPAD_TIMES, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x55 }, + { KEY_EN_NUMPAD_MINUS, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x56 }, + { KEY_EN_NUMPAD_PLUS, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x57 }, + { KEY_EN_NUMPAD_ENTER, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x58 }, + { KEY_EN_NUMPAD_1, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x59 }, + { KEY_EN_NUMPAD_2, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5A }, + { KEY_EN_NUMPAD_3, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5B }, + { KEY_EN_NUMPAD_4, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5C }, + { KEY_EN_NUMPAD_5, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5D }, + { KEY_EN_NUMPAD_6, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5E }, + { KEY_EN_NUMPAD_7, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5F }, + { KEY_EN_NUMPAD_8, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x60 }, + { KEY_EN_NUMPAD_9, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x61 }, + { KEY_EN_NUMPAD_0, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x62 }, + { KEY_EN_NUMPAD_PERIOD, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x63 }, + { KEY_EN_ISO_BACK_SLASH, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { KEY_EN_MENU, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x65 }, + { KEY_EN_LEFT_CONTROL, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE0 }, + { KEY_EN_LEFT_SHIFT, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE1 }, + { KEY_EN_LEFT_ALT, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE2 }, + { KEY_EN_LEFT_WINDOWS, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE3 }, + { KEY_EN_RIGHT_CONTROL, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE4 }, + { KEY_EN_RIGHT_SHIFT, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE5 }, + { KEY_EN_RIGHT_ALT, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE6 }, + { KEY_EN_RIGHT_WINDOWS, LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE7 }, + { KEY_EN_MEDIA_NEXT, LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB5 }, + { KEY_EN_MEDIA_PREVIOUS, LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB6 }, + { KEY_EN_MEDIA_STOP, LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB7 }, + { KEY_EN_MEDIA_PLAY_PAUSE, LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xCD }, + { KEY_EN_MEDIA_MUTE, LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xE2 }, { "Logo", LOGITECH_G810_ZONE_DIRECT_LOGO, 0x01 }, { "Lighting", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x01 }, { "Game Mode", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x02 }, diff --git a/Controllers/LogitechController/RGBController_LogitechG815.cpp b/Controllers/LogitechController/RGBController_LogitechG815.cpp index d7d217ae..09f15654 100644 --- a/Controllers/LogitechController/RGBController_LogitechG815.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG815.cpp @@ -7,6 +7,7 @@ | Cheerpipe 3/20/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_LogitechG815.h" #include #include @@ -50,116 +51,116 @@ typedef struct static const led_type led_names[] = { /* Key Label Zone, Index */ - { "Key: A", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x04 }, - { "Key: B", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x05 }, - { "Key: C", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x06 }, - { "Key: D", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x07 }, - { "Key: E", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x08 }, - { "Key: F", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x09 }, - { "Key: G", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0A }, - { "Key: H", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0B }, - { "Key: I", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0C }, - { "Key: J", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0D }, - { "Key: K", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0E }, - { "Key: L", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0F }, - { "Key: M", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x10 }, - { "Key: N", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x11 }, - { "Key: O", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x12 }, - { "Key: P", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x13 }, - { "Key: Q", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x14 }, - { "Key: R", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x15 }, - { "Key: S", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x16 }, - { "Key: T", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x17 }, - { "Key: U", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x18 }, - { "Key: V", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x19 }, - { "Key: W", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1A }, - { "Key: X", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1B }, - { "Key: Y", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1C }, - { "Key: Z", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1D }, - { "Key: 1", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1E }, - { "Key: 2", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1F }, - { "Key: 3", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x20 }, - { "Key: 4", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x21 }, - { "Key: 5", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x22 }, - { "Key: 6", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x23 }, - { "Key: 7", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x24 }, - { "Key: 8", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x25 }, - { "Key: 9", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x26 }, - { "Key: 0", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x27 }, - { "Key: Enter", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x28 }, - { "Key: Escape", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x29 }, - { "Key: Backspace", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2A }, - { "Key: Tab", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2B }, - { "Key: Space", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2C }, - { "Key: -", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2D }, - { "Key: =", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2E }, - { "Key: [", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2F }, - { "Key: ]", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x30 }, - { "Key: \\ (ANSI)", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only - { "Key: #", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only - { "Key: ;", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x33 }, - { "Key: '", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x34 }, - { "Key: `", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x35 }, - { "Key: ,", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x36 }, - { "Key: .", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x37 }, - { "Key: /", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x38 }, - { "Key: Caps Lock", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x39 }, - { "Key: F1", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3A }, - { "Key: F2", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3B }, - { "Key: F3", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3C }, - { "Key: F4", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3D }, - { "Key: F5", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3E }, - { "Key: F6", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3F }, - { "Key: F7", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x40 }, - { "Key: F8", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x41 }, - { "Key: F9", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x42 }, - { "Key: F10", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x43 }, - { "Key: F11", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x44 }, - { "Key: F12", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x45 }, - { "Key: Print Screen", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x46 }, - { "Key: Scroll Lock", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x47 }, - { "Key: Pause/Break", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x48 }, - { "Key: Insert", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x49 }, - { "Key: Home", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4A }, - { "Key: Page Up", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4B }, - { "Key: Delete", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4C }, - { "Key: End", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4D }, - { "Key: Page Down", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4E }, - { "Key: Right Arrow", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4F }, - { "Key: Left Arrow", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x50 }, - { "Key: Down Arrow", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x51 }, - { "Key: Up Arrow", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x52 }, - { "Key: Num Lock", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x53 }, - { "Key: Number Pad /", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x54 }, - { "Key: Number Pad *", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x55 }, - { "Key: Number Pad -", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x56 }, - { "Key: Number Pad +", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x57 }, - { "Key: Number Pad Enter", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x58 }, - { "Key: Number Pad 1", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x59 }, - { "Key: Number Pad 2", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5A }, - { "Key: Number Pad 3", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5B }, - { "Key: Number Pad 4", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5C }, - { "Key: Number Pad 5", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5D }, - { "Key: Number Pad 6", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5E }, - { "Key: Number Pad 7", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5F }, - { "Key: Number Pad 8", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x60 }, - { "Key: Number Pad 9", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x61 }, - { "Key: Number Pad 0", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x62 }, - { "Key: Number Pad .", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x63 }, - { "Key: \\ (ISO)", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only - { "Key: Menu", LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x65 }, - { "Key: Left Control", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE0 }, - { "Key: Left Shift", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE1 }, - { "Key: Left Alt", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE2 }, - { "Key: Left Windows", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE3 }, - { "Key: Right Control", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE4 }, - { "Key: Right Shift", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE5 }, - { "Key: Right Alt", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE6 }, - { "Key: Right Windows", LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE7 }, - { "Key: Media Previous", LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9E }, - { "Key: Media Play/Pause", LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9B }, - { "Key: Media Next", LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9D }, - { "Key: Media Mute", LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9C }, + { KEY_EN_A, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x04 }, + { KEY_EN_B, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x05 }, + { KEY_EN_C, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x06 }, + { KEY_EN_D, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x07 }, + { KEY_EN_E, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x08 }, + { KEY_EN_F, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x09 }, + { KEY_EN_G, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0A }, + { KEY_EN_H, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0B }, + { KEY_EN_I, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0C }, + { KEY_EN_J, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0D }, + { KEY_EN_K, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0E }, + { KEY_EN_L, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x0F }, + { KEY_EN_M, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x10 }, + { KEY_EN_N, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x11 }, + { KEY_EN_O, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x12 }, + { KEY_EN_P, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x13 }, + { KEY_EN_Q, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x14 }, + { KEY_EN_R, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x15 }, + { KEY_EN_S, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x16 }, + { KEY_EN_T, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x17 }, + { KEY_EN_U, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x18 }, + { KEY_EN_V, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x19 }, + { KEY_EN_W, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1A }, + { KEY_EN_X, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1B }, + { KEY_EN_Y, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1C }, + { KEY_EN_Z, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1D }, + { KEY_EN_1, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1E }, + { KEY_EN_2, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x1F }, + { KEY_EN_3, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x20 }, + { KEY_EN_4, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x21 }, + { KEY_EN_5, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x22 }, + { KEY_EN_6, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x23 }, + { KEY_EN_7, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x24 }, + { KEY_EN_8, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x25 }, + { KEY_EN_9, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x26 }, + { KEY_EN_0, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x27 }, + { KEY_EN_ANSI_ENTER, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x28 }, + { KEY_EN_ESCAPE, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x29 }, + { KEY_EN_BACKSPACE, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2A }, + { KEY_EN_TAB, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2B }, + { KEY_EN_SPACE, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2C }, + { KEY_EN_MINUS, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2D }, + { KEY_EN_EQUALS, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2E }, + { KEY_EN_LEFT_BRACKET, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x2F }, + { KEY_EN_RIGHT_BRACKET, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x30 }, + { KEY_EN_ANSI_BACK_SLASH, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only + { KEY_EN_POUND, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only + { KEY_EN_SEMICOLON, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x33 }, + { KEY_EN_QUOTE, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x34 }, + { KEY_EN_BACK_TICK, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x35 }, + { KEY_EN_COMMA, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x36 }, + { KEY_EN_PERIOD, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x37 }, + { KEY_EN_FORWARD_SLASH, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x38 }, + { KEY_EN_CAPS_LOCK, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x39 }, + { KEY_EN_F1, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3A }, + { KEY_EN_F2, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3B }, + { KEY_EN_F3, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3C }, + { KEY_EN_F4, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3D }, + { KEY_EN_F5, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3E }, + { KEY_EN_F6, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x3F }, + { KEY_EN_F7, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x40 }, + { KEY_EN_F8, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x41 }, + { KEY_EN_F9, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x42 }, + { KEY_EN_F10, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x43 }, + { KEY_EN_F11, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x44 }, + { KEY_EN_F12, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x45 }, + { KEY_EN_PRINT_SCREEN, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x46 }, + { KEY_EN_SCROLL_LOCK, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x47 }, + { KEY_EN_PAUSE_BREAK, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x48 }, + { KEY_EN_INSERT, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x49 }, + { KEY_EN_HOME, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4A }, + { KEY_EN_PAGE_UP, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4B }, + { KEY_EN_DELETE, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4C }, + { KEY_EN_END, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4D }, + { KEY_EN_PAGE_DOWN, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4E }, + { KEY_EN_RIGHT_ARROW, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x4F }, + { KEY_EN_LEFT_ARROW, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x50 }, + { KEY_EN_DOWN_ARROW, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x51 }, + { KEY_EN_UP_ARROW, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x52 }, + { KEY_EN_NUMPAD_LOCK, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x53 }, + { KEY_EN_NUMPAD_DIVIDE, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x54 }, + { KEY_EN_NUMPAD_TIMES, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x55 }, + { KEY_EN_NUMPAD_MINUS, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x56 }, + { KEY_EN_NUMPAD_PLUS, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x57 }, + { KEY_EN_NUMPAD_ENTER, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x58 }, + { KEY_EN_NUMPAD_1, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x59 }, + { KEY_EN_NUMPAD_2, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5A }, + { KEY_EN_NUMPAD_3, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5B }, + { KEY_EN_NUMPAD_4, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5C }, + { KEY_EN_NUMPAD_5, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5D }, + { KEY_EN_NUMPAD_6, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5E }, + { KEY_EN_NUMPAD_7, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x5F }, + { KEY_EN_NUMPAD_8, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x60 }, + { KEY_EN_NUMPAD_9, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x61 }, + { KEY_EN_NUMPAD_0, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x62 }, + { KEY_EN_NUMPAD_PERIOD, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x63 }, + { KEY_EN_ISO_BACK_SLASH, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { KEY_EN_MENU, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x65 }, + { KEY_EN_LEFT_CONTROL, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE0 }, + { KEY_EN_LEFT_SHIFT, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE1 }, + { KEY_EN_LEFT_ALT, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE2 }, + { KEY_EN_LEFT_WINDOWS, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE3 }, + { KEY_EN_RIGHT_CONTROL, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE4 }, + { KEY_EN_RIGHT_SHIFT, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE5 }, + { KEY_EN_RIGHT_ALT, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE6 }, + { KEY_EN_RIGHT_WINDOWS, LOGITECH_G815_ZONE_MODE_MODIFIERS, 0xE7 }, + { KEY_EN_MEDIA_PREVIOUS, LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9E }, + { KEY_EN_MEDIA_PLAY_PAUSE, LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9B }, + { KEY_EN_MEDIA_NEXT, LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9D }, + { KEY_EN_MEDIA_MUTE, LOGITECH_G815_ZONE_DIRECT_MEDIA, 0x9C }, { "Logo", LOGITECH_G815_ZONE_DIRECT_LOGO, 0x01 }, { "Lighting", LOGITECH_G815_ZONE_DIRECT_INDICATORS, 0x99 }, { "Key: G1", LOGITECH_G815_ZONE_MODE_GKEYS, 0x01 }, diff --git a/Controllers/LogitechController/RGBController_LogitechG910.cpp b/Controllers/LogitechController/RGBController_LogitechG910.cpp index efc34564..ebc4b2c2 100644 --- a/Controllers/LogitechController/RGBController_LogitechG910.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG910.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 6/12/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_LogitechG910.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -47,112 +48,112 @@ typedef struct static const led_type led_names[] = { /* Key Label Zone, Index */ - { "Key: A", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x04 }, - { "Key: B", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x05 }, - { "Key: C", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x06 }, - { "Key: D", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x07 }, - { "Key: E", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x08 }, - { "Key: F", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x09 }, - { "Key: G", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0A }, - { "Key: H", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0B }, - { "Key: I", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0C }, - { "Key: J", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0D }, - { "Key: K", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0E }, - { "Key: L", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0F }, - { "Key: M", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x10 }, - { "Key: N", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x11 }, - { "Key: O", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x12 }, - { "Key: P", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x13 }, - { "Key: Q", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x14 }, - { "Key: R", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x15 }, - { "Key: S", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x16 }, - { "Key: T", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x17 }, - { "Key: U", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x18 }, - { "Key: V", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x19 }, - { "Key: W", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1A }, - { "Key: X", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1B }, - { "Key: Y", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1C }, - { "Key: Z", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1D }, - { "Key: 1", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1E }, - { "Key: 2", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1F }, - { "Key: 3", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x20 }, - { "Key: 4", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x21 }, - { "Key: 5", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x22 }, - { "Key: 6", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x23 }, - { "Key: 7", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x24 }, - { "Key: 8", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x25 }, - { "Key: 9", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x26 }, - { "Key: 0", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x27 }, - { "Key: Enter", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x28 }, - { "Key: Escape", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x29 }, - { "Key: Backspace", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2A }, - { "Key: Tab", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2B }, - { "Key: Space", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2C }, - { "Key: -", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2D }, - { "Key: =", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2E }, - { "Key: [", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2F }, - { "Key: ]", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x30 }, - { "Key: \\ (ANSI)", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only - { "Key: #", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only - { "Key: ;", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x33 }, - { "Key: '", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x34 }, - { "Key: `", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x35 }, - { "Key: ,", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x36 }, - { "Key: .", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x37 }, - { "Key: /", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x38 }, - { "Key: Caps Lock", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x39 }, - { "Key: F1", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3A }, - { "Key: F2", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3B }, - { "Key: F3", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3C }, - { "Key: F4", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3D }, - { "Key: F5", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3E }, - { "Key: F6", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3F }, - { "Key: F7", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x40 }, - { "Key: F8", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x41 }, - { "Key: F9", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x42 }, - { "Key: F10", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x43 }, - { "Key: F11", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x44 }, - { "Key: F12", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x45 }, - { "Key: Print Screen", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x46 }, - { "Key: Scroll Lock", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x47 }, - { "Key: Pause/Break", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x48 }, - { "Key: Insert", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x49 }, - { "Key: Home", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4A }, - { "Key: Page Up", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4B }, - { "Key: Delete", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4C }, - { "Key: End", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4D }, - { "Key: Page Down", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4E }, - { "Key: Right Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4F }, - { "Key: Left Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x50 }, - { "Key: Down Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x51 }, - { "Key: Up Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x52 }, - { "Key: Num Lock", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x53 }, - { "Key: Number Pad /", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x54 }, - { "Key: Number Pad *", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x55 }, - { "Key: Number Pad -", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x56 }, - { "Key: Number Pad +", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x57 }, - { "Key: Number Pad Enter", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x58 }, - { "Key: Number Pad 1", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x59 }, - { "Key: Number Pad 2", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5A }, - { "Key: Number Pad 3", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5B }, - { "Key: Number Pad 4", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5C }, - { "Key: Number Pad 5", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5D }, - { "Key: Number Pad 6", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5E }, - { "Key: Number Pad 7", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5F }, - { "Key: Number Pad 8", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x60 }, - { "Key: Number Pad 9", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x61 }, - { "Key: Number Pad 0", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x62 }, - { "Key: Number Pad .", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x63 }, - { "Key: \\ (ISO)", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only - { "Key: Menu", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x65 }, - { "Key: Left Control", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE0 }, - { "Key: Left Shift", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE1 }, - { "Key: Left Alt", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE2 }, - { "Key: Left Windows", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE3 }, - { "Key: Right Control", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE4 }, - { "Key: Right Shift", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE5 }, - { "Key: Right Alt", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE6 }, - { "Key: Right Windows", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE7 }, + { KEY_EN_A, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x04 }, + { KEY_EN_B, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x05 }, + { KEY_EN_C, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x06 }, + { KEY_EN_D, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x07 }, + { KEY_EN_E, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x08 }, + { KEY_EN_F, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x09 }, + { KEY_EN_G, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0A }, + { KEY_EN_H, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0B }, + { KEY_EN_I, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0C }, + { KEY_EN_J, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0D }, + { KEY_EN_K, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0E }, + { KEY_EN_L, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0F }, + { KEY_EN_M, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x10 }, + { KEY_EN_N, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x11 }, + { KEY_EN_O, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x12 }, + { KEY_EN_P, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x13 }, + { KEY_EN_Q, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x14 }, + { KEY_EN_R, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x15 }, + { KEY_EN_S, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x16 }, + { KEY_EN_T, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x17 }, + { KEY_EN_U, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x18 }, + { KEY_EN_V, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x19 }, + { KEY_EN_W, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1A }, + { KEY_EN_X, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1B }, + { KEY_EN_Y, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1C }, + { KEY_EN_Z, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1D }, + { KEY_EN_1, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1E }, + { KEY_EN_2, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1F }, + { KEY_EN_3, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x20 }, + { KEY_EN_4, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x21 }, + { KEY_EN_5, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x22 }, + { KEY_EN_6, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x23 }, + { KEY_EN_7, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x24 }, + { KEY_EN_8, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x25 }, + { KEY_EN_9, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x26 }, + { KEY_EN_0, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x27 }, + { KEY_EN_ANSI_ENTER, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x28 }, + { KEY_EN_ESCAPE, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x29 }, + { KEY_EN_BACKSPACE, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2A }, + { KEY_EN_TAB, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2B }, + { KEY_EN_SPACE, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2C }, + { KEY_EN_MINUS, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2D }, + { KEY_EN_EQUALS, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2E }, + { KEY_EN_LEFT_BRACKET, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2F }, + { KEY_EN_RIGHT_BRACKET, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x30 }, + { KEY_EN_ANSI_BACK_SLASH, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only + { KEY_EN_POUND, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only + { KEY_EN_SEMICOLON, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x33 }, + { KEY_EN_QUOTE, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x34 }, + { KEY_EN_BACK_TICK, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x35 }, + { KEY_EN_COMMA, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x36 }, + { KEY_EN_PERIOD, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x37 }, + { KEY_EN_FORWARD_SLASH, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x38 }, + { KEY_EN_CAPS_LOCK, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x39 }, + { KEY_EN_F1, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3A }, + { KEY_EN_F2, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3B }, + { KEY_EN_F3, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3C }, + { KEY_EN_F4, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3D }, + { KEY_EN_F5, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3E }, + { KEY_EN_F6, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3F }, + { KEY_EN_F7, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x40 }, + { KEY_EN_F8, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x41 }, + { KEY_EN_F9, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x42 }, + { KEY_EN_F10, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x43 }, + { KEY_EN_F11, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x44 }, + { KEY_EN_F12, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x45 }, + { KEY_EN_PRINT_SCREEN, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x46 }, + { KEY_EN_SCROLL_LOCK, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x47 }, + { KEY_EN_PAUSE_BREAK, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x48 }, + { KEY_EN_INSERT, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x49 }, + { KEY_EN_HOME, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4A }, + { KEY_EN_PAGE_UP, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4B }, + { KEY_EN_DELETE, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4C }, + { KEY_EN_END, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4D }, + { KEY_EN_PAGE_DOWN, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4E }, + { KEY_EN_RIGHT_ARROW, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4F }, + { KEY_EN_LEFT_ARROW, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x50 }, + { KEY_EN_DOWN_ARROW, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x51 }, + { KEY_EN_UP_ARROW, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x52 }, + { KEY_EN_NUMPAD_LOCK, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x53 }, + { KEY_EN_NUMPAD_DIVIDE, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x54 }, + { KEY_EN_NUMPAD_TIMES, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x55 }, + { KEY_EN_NUMPAD_MINUS, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x56 }, + { KEY_EN_NUMPAD_PLUS, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x57 }, + { KEY_EN_NUMPAD_ENTER, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x58 }, + { KEY_EN_NUMPAD_1, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x59 }, + { KEY_EN_NUMPAD_2, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5A }, + { KEY_EN_NUMPAD_3, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5B }, + { KEY_EN_NUMPAD_4, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5C }, + { KEY_EN_NUMPAD_5, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5D }, + { KEY_EN_NUMPAD_6, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5E }, + { KEY_EN_NUMPAD_7, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5F }, + { KEY_EN_NUMPAD_8, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x60 }, + { KEY_EN_NUMPAD_9, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x61 }, + { KEY_EN_NUMPAD_0, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x62 }, + { KEY_EN_NUMPAD_PERIOD, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x63 }, + { KEY_EN_ISO_BACK_SLASH, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { KEY_EN_MENU, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x65 }, + { KEY_EN_LEFT_CONTROL, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE0 }, + { KEY_EN_LEFT_SHIFT, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE1 }, + { KEY_EN_LEFT_ALT, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE2 }, + { KEY_EN_LEFT_WINDOWS, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE3 }, + { KEY_EN_RIGHT_CONTROL, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE4 }, + { KEY_EN_RIGHT_SHIFT, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE5 }, + { KEY_EN_RIGHT_ALT, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE6 }, + { KEY_EN_RIGHT_WINDOWS, LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE7 }, { "Key: G1", LOGITECH_G910_ZONE_DIRECT_GKEYS, 0x01 }, { "Key: G2", LOGITECH_G910_ZONE_DIRECT_GKEYS, 0x02 }, { "Key: G3", LOGITECH_G910_ZONE_DIRECT_GKEYS, 0x03 }, diff --git a/Controllers/LogitechController/RGBController_LogitechG915.cpp b/Controllers/LogitechController/RGBController_LogitechG915.cpp index 0853bb6e..0b0b9ca3 100644 --- a/Controllers/LogitechController/RGBController_LogitechG915.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG915.cpp @@ -7,6 +7,7 @@ | Cheerpipe 3/20/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_LogitechG915.h" #include #include @@ -62,118 +63,118 @@ typedef struct static const led_type led_names[] = { /* Key Label Zone, Index */ - { "Key: A", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x04 }, - { "Key: B", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x05 }, - { "Key: C", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x06 }, - { "Key: D", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x07 }, - { "Key: E", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x08 }, - { "Key: F", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x09 }, - { "Key: G", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0A }, - { "Key: H", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0B }, - { "Key: I", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0C }, - { "Key: J", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0D }, - { "Key: K", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0E }, - { "Key: L", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0F }, - { "Key: M", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x10 }, - { "Key: N", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x11 }, - { "Key: O", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x12 }, - { "Key: P", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x13 }, - { "Key: Q", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x14 }, - { "Key: R", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x15 }, - { "Key: S", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x16 }, - { "Key: T", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x17 }, - { "Key: U", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x18 }, - { "Key: V", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x19 }, - { "Key: W", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1A }, - { "Key: X", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1B }, - { "Key: Y", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1C }, - { "Key: Z", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1D }, - { "Key: 1", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1E }, - { "Key: 2", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1F }, - { "Key: 3", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x20 }, - { "Key: 4", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x21 }, - { "Key: 5", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x22 }, - { "Key: 6", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x23 }, - { "Key: 7", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x24 }, - { "Key: 8", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x25 }, - { "Key: 9", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x26 }, - { "Key: 0", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x27 }, - { "Key: Enter", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x28 }, - { "Key: Escape", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x29 }, - { "Key: Backspace", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2A }, - { "Key: Tab", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2B }, - { "Key: Space", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2C }, - { "Key: -", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2D }, - { "Key: =", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2E }, - { "Key: [", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2F }, - { "Key: ]", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x30 }, - { "Key: \\ (ANSI)", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only - { "Key: #", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only - { "Key: ;", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x33 }, - { "Key: '", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x34 }, - { "Key: `", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x35 }, - { "Key: ,", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x36 }, - { "Key: .", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x37 }, - { "Key: /", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x38 }, - { "Key: Caps Lock", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x39 }, - { "Key: F1", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3A }, - { "Key: F2", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3B }, - { "Key: F3", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3C }, - { "Key: F4", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3D }, - { "Key: F5", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3E }, - { "Key: F6", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3F }, - { "Key: F7", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x40 }, - { "Key: F8", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x41 }, - { "Key: F9", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x42 }, - { "Key: F10", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x43 }, - { "Key: F11", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x44 }, - { "Key: F12", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x45 }, - { "Key: Print Screen", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x46 }, - { "Key: Scroll Lock", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x47 }, - { "Key: Pause/Break", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x48 }, - { "Key: Insert", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x49 }, - { "Key: Home", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4A }, - { "Key: Page Up", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4B }, - { "Key: Delete", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4C }, - { "Key: End", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4D }, - { "Key: Page Down", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4E }, - { "Key: Right Arrow", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4F }, - { "Key: Left Arrow", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x50 }, - { "Key: Down Arrow", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x51 }, - { "Key: Up Arrow", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x52 }, - { "Key: \\ (ISO)", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only - { "Key: Menu", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x65 }, - { "Key: Left Control", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE0 }, - { "Key: Left Shift", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE1 }, - { "Key: Left Alt", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE2 }, - { "Key: Left Windows", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE3 }, - { "Key: Right Control", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE4 }, - { "Key: Right Shift", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE5 }, - { "Key: Right Alt", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE6 }, - { "Key: Right Windows", LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE7 }, - { "Key: Media Previous", LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9E }, - { "Key: Media Play/Pause", LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9B }, - { "Key: Media Next", LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9D }, - { "Key: Media Mute", LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9C }, + { KEY_EN_A, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x04 }, + { KEY_EN_B, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x05 }, + { KEY_EN_C, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x06 }, + { KEY_EN_D, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x07 }, + { KEY_EN_E, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x08 }, + { KEY_EN_F, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x09 }, + { KEY_EN_G, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0A }, + { KEY_EN_H, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0B }, + { KEY_EN_I, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0C }, + { KEY_EN_J, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0D }, + { KEY_EN_K, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0E }, + { KEY_EN_L, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x0F }, + { KEY_EN_M, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x10 }, + { KEY_EN_N, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x11 }, + { KEY_EN_O, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x12 }, + { KEY_EN_P, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x13 }, + { KEY_EN_Q, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x14 }, + { KEY_EN_R, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x15 }, + { KEY_EN_S, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x16 }, + { KEY_EN_T, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x17 }, + { KEY_EN_U, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x18 }, + { KEY_EN_V, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x19 }, + { KEY_EN_W, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1A }, + { KEY_EN_X, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1B }, + { KEY_EN_Y, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1C }, + { KEY_EN_Z, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1D }, + { KEY_EN_1, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1E }, + { KEY_EN_2, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x1F }, + { KEY_EN_3, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x20 }, + { KEY_EN_4, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x21 }, + { KEY_EN_5, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x22 }, + { KEY_EN_6, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x23 }, + { KEY_EN_7, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x24 }, + { KEY_EN_8, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x25 }, + { KEY_EN_9, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x26 }, + { KEY_EN_0, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x27 }, + { KEY_EN_ANSI_ENTER, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x28 }, + { KEY_EN_ESCAPE, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x29 }, + { KEY_EN_BACKSPACE, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2A }, + { KEY_EN_TAB, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2B }, + { KEY_EN_SPACE, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2C }, + { KEY_EN_MINUS, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2D }, + { KEY_EN_EQUALS, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2E }, + { KEY_EN_LEFT_BRACKET, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x2F }, + { KEY_EN_RIGHT_BRACKET, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x30 }, + { KEY_EN_ANSI_BACK_SLASH, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only + { KEY_EN_POUND, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only + { KEY_EN_SEMICOLON, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x33 }, + { KEY_EN_QUOTE, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x34 }, + { KEY_EN_BACK_TICK, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x35 }, + { KEY_EN_COMMA, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x36 }, + { KEY_EN_PERIOD, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x37 }, + { KEY_EN_FORWARD_SLASH, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x38 }, + { KEY_EN_CAPS_LOCK, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x39 }, + { KEY_EN_F1, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3A }, + { KEY_EN_F2, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3B }, + { KEY_EN_F3, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3C }, + { KEY_EN_F4, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3D }, + { KEY_EN_F5, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3E }, + { KEY_EN_F6, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x3F }, + { KEY_EN_F7, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x40 }, + { KEY_EN_F8, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x41 }, + { KEY_EN_F9, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x42 }, + { KEY_EN_F10, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x43 }, + { KEY_EN_F11, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x44 }, + { KEY_EN_F12, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x45 }, + { KEY_EN_PRINT_SCREEN, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x46 }, + { KEY_EN_SCROLL_LOCK, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x47 }, + { KEY_EN_PAUSE_BREAK, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x48 }, + { KEY_EN_INSERT, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x49 }, + { KEY_EN_HOME, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4A }, + { KEY_EN_PAGE_UP, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4B }, + { KEY_EN_DELETE, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4C }, + { KEY_EN_END, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4D }, + { KEY_EN_PAGE_DOWN, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4E }, + { KEY_EN_RIGHT_ARROW, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x4F }, + { KEY_EN_LEFT_ARROW, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x50 }, + { KEY_EN_DOWN_ARROW, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x51 }, + { KEY_EN_UP_ARROW, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x52 }, + { KEY_EN_ISO_BACK_SLASH, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { KEY_EN_MENU, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x65 }, + { KEY_EN_LEFT_CONTROL, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE0 }, + { KEY_EN_LEFT_SHIFT, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE1 }, + { KEY_EN_LEFT_ALT, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE2 }, + { KEY_EN_LEFT_WINDOWS, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE3 }, + { KEY_EN_RIGHT_CONTROL, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE4 }, + { KEY_EN_RIGHT_SHIFT, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE5 }, + { KEY_EN_RIGHT_ALT, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE6 }, + { KEY_EN_RIGHT_WINDOWS, LOGITECH_G915_ZONE_MODE_MODIFIERS, 0xE7 }, + { KEY_EN_MEDIA_PREVIOUS, LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9E }, + { KEY_EN_MEDIA_PLAY_PAUSE, LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9B }, + { KEY_EN_MEDIA_NEXT, LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9D }, + { KEY_EN_MEDIA_MUTE, LOGITECH_G915_ZONE_DIRECT_MEDIA, 0x9C }, { "Logo", LOGITECH_G915_ZONE_DIRECT_LOGO, 0x01 }, { "Key: Brightness", LOGITECH_G915_ZONE_DIRECT_INDICATORS, 0x99 }, - { "Key: Num Lock", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x53 }, // First Non-TKL Key - { "Key: Number Pad /", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x54 }, - { "Key: Number Pad *", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x55 }, - { "Key: Number Pad -", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x56 }, - { "Key: Number Pad +", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x57 }, - { "Key: Number Pad Enter", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x58 }, - { "Key: Number Pad 1", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x59 }, - { "Key: Number Pad 2", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5A }, - { "Key: Number Pad 3", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5B }, - { "Key: Number Pad 4", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5C }, - { "Key: Number Pad 5", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5D }, - { "Key: Number Pad 6", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5E }, - { "Key: Number Pad 7", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5F }, - { "Key: Number Pad 8", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x60 }, - { "Key: Number Pad 9", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x61 }, - { "Key: Number Pad 0", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x62 }, - { "Key: Number Pad .", LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x63 }, + { KEY_EN_NUMPAD_LOCK, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x53 }, // First Non-TKL Key + { KEY_EN_NUMPAD_DIVIDE, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x54 }, + { KEY_EN_NUMPAD_TIMES, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x55 }, + { KEY_EN_NUMPAD_MINUS, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x56 }, + { KEY_EN_NUMPAD_PLUS, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x57 }, + { KEY_EN_NUMPAD_ENTER, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x58 }, + { KEY_EN_NUMPAD_1, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x59 }, + { KEY_EN_NUMPAD_2, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5A }, + { KEY_EN_NUMPAD_3, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5B }, + { KEY_EN_NUMPAD_4, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5C }, + { KEY_EN_NUMPAD_5, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5D }, + { KEY_EN_NUMPAD_6, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5E }, + { KEY_EN_NUMPAD_7, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x5F }, + { KEY_EN_NUMPAD_8, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x60 }, + { KEY_EN_NUMPAD_9, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x61 }, + { KEY_EN_NUMPAD_0, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x62 }, + { KEY_EN_NUMPAD_PERIOD, LOGITECH_G915_ZONE_DIRECT_KEYBOARD, 0x63 }, { "Key: G1", LOGITECH_G915_ZONE_MODE_GKEYS, 0x01 }, { "Key: G2", LOGITECH_G915_ZONE_MODE_GKEYS, 0x02 }, { "Key: G3", LOGITECH_G915_ZONE_MODE_GKEYS, 0x03 }, diff --git a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp index a6fbff86..9084bfde 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp @@ -7,6 +7,7 @@ | sanchezzzs 20/10/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_LogitechGProKeyboard.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -46,95 +47,95 @@ typedef struct static const led_type led_names[] = { /* Key Label Zone, Index */ - { "Key: A", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x04 },//00 - { "Key: B", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x05 }, - { "Key: C", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x06 }, - { "Key: D", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x07 }, - { "Key: E", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x08 }, - { "Key: F", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x09 }, - { "Key: G", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0A }, - { "Key: H", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0B }, - { "Key: I", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0C }, - { "Key: J", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0D }, - { "Key: K", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0E },//10 - { "Key: L", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0F }, - { "Key: M", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x10 }, - { "Key: N", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x11 }, - { "Key: O", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x12 }, - { "Key: P", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x13 }, - { "Key: Q", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x14 }, - { "Key: R", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x15 }, - { "Key: S", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x16 }, - { "Key: T", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x17 }, - { "Key: U", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x18 },//20 - { "Key: V", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x19 }, - { "Key: W", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1A }, - { "Key: X", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1B }, - { "Key: Y", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1C }, - { "Key: Z", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1D }, - { "Key: 1", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1E }, - { "Key: 2", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1F }, - { "Key: 3", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x20 }, - { "Key: 4", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x21 }, - { "Key: 5", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x22 },//30 - { "Key: 6", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x23 }, - { "Key: 7", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x24 }, - { "Key: 8", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x25 }, - { "Key: 9", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x26 }, - { "Key: 0", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x27 }, - { "Key: Enter", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x28 }, - { "Key: Escape", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x29 }, - { "Key: Backspace", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2A }, - { "Key: Tab", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2B }, - { "Key: Space", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2C },//40 - { "Key: -", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2D }, - { "Key: =", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2E }, - { "Key: [", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2F }, - { "Key: ]", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x30 }, - { "Key: \\ (ANSI)", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only - { "Key: #", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only - { "Key: ;", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x33 }, - { "Key: '", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x34 }, - { "Key: `", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x35 }, - { "Key: ,", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x36 },//50 - { "Key: .", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x37 }, - { "Key: /", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x38 }, - { "Key: Caps Lock", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x39 }, - { "Key: F1", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3A }, - { "Key: F2", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3B }, - { "Key: F3", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3C }, - { "Key: F4", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3D }, - { "Key: F5", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3E }, - { "Key: F6", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3F }, - { "Key: F7", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x40 },//60 - { "Key: F8", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x41 }, - { "Key: F9", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x42 }, - { "Key: F10", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x43 }, - { "Key: F11", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x44 }, - { "Key: F12", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x45 }, - { "Key: Print Screen", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x46 }, - { "Key: Scroll Lock", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x47 }, - { "Key: Pause/Break", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x48 }, - { "Key: Insert", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x49 }, - { "Key: Home", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4A },//70 - { "Key: Page Up", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4B }, - { "Key: Delete", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4C }, - { "Key: End", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4D }, - { "Key: Page Down", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4E }, - { "Key: Right Arrow", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4F }, - { "Key: Left Arrow", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x50 }, - { "Key: Down Arrow", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x51 }, - { "Key: Up Arrow", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x52 }, - { "Key: \\ (ISO)", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only - { "Key: Menu", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x65 },//80 - { "Key: Left Control", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE0 }, - { "Key: Left Shift", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE1 }, - { "Key: Left Alt", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE2 }, - { "Key: Left Windows", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE3 }, - { "Key: Right Control", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE4 }, - { "Key: Right Shift", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE5 }, - { "Key: Right Alt", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE6 }, - { "Key: Fn", LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE7 }, + { KEY_EN_A, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x04 },//00 + { KEY_EN_B, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x05 }, + { KEY_EN_C, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x06 }, + { KEY_EN_D, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x07 }, + { KEY_EN_E, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x08 }, + { KEY_EN_F, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x09 }, + { KEY_EN_G, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0A }, + { KEY_EN_H, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0B }, + { KEY_EN_I, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0C }, + { KEY_EN_J, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0D }, + { KEY_EN_K, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0E },//10 + { KEY_EN_L, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x0F }, + { KEY_EN_M, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x10 }, + { KEY_EN_N, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x11 }, + { KEY_EN_O, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x12 }, + { KEY_EN_P, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x13 }, + { KEY_EN_Q, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x14 }, + { KEY_EN_R, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x15 }, + { KEY_EN_S, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x16 }, + { KEY_EN_T, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x17 }, + { KEY_EN_U, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x18 },//20 + { KEY_EN_V, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x19 }, + { KEY_EN_W, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1A }, + { KEY_EN_X, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1B }, + { KEY_EN_Y, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1C }, + { KEY_EN_Z, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1D }, + { KEY_EN_1, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1E }, + { KEY_EN_2, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x1F }, + { KEY_EN_3, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x20 }, + { KEY_EN_4, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x21 }, + { KEY_EN_5, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x22 },//30 + { KEY_EN_6, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x23 }, + { KEY_EN_7, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x24 }, + { KEY_EN_8, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x25 }, + { KEY_EN_9, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x26 }, + { KEY_EN_0, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x27 }, + { KEY_EN_ANSI_ENTER, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x28 }, + { KEY_EN_ESCAPE, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x29 }, + { KEY_EN_BACKSPACE, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2A }, + { KEY_EN_TAB, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2B }, + { KEY_EN_SPACE, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2C },//40 + { KEY_EN_MINUS, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2D }, + { KEY_EN_EQUALS, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2E }, + { KEY_EN_LEFT_BRACKET, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x2F }, + { KEY_EN_RIGHT_BRACKET, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x30 }, + { KEY_EN_ANSI_BACK_SLASH, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only + { KEY_EN_POUND, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only + { KEY_EN_SEMICOLON, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x33 }, + { KEY_EN_QUOTE, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x34 }, + { KEY_EN_BACK_TICK, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x35 }, + { KEY_EN_COMMA, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x36 },//50 + { KEY_EN_PERIOD, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x37 }, + { KEY_EN_FORWARD_SLASH, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x38 }, + { KEY_EN_CAPS_LOCK, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x39 }, + { KEY_EN_F1, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3A }, + { KEY_EN_F2, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3B }, + { KEY_EN_F3, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3C }, + { KEY_EN_F4, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3D }, + { KEY_EN_F5, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3E }, + { KEY_EN_F6, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x3F }, + { KEY_EN_F7, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x40 },//60 + { KEY_EN_F8, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x41 }, + { KEY_EN_F9, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x42 }, + { KEY_EN_F10, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x43 }, + { KEY_EN_F11, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x44 }, + { KEY_EN_F12, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x45 }, + { KEY_EN_PRINT_SCREEN, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x46 }, + { KEY_EN_SCROLL_LOCK, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x47 }, + { KEY_EN_PAUSE_BREAK, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x48 }, + { KEY_EN_INSERT, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x49 }, + { KEY_EN_HOME, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4A },//70 + { KEY_EN_PAGE_UP, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4B }, + { KEY_EN_DELETE, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4C }, + { KEY_EN_END, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4D }, + { KEY_EN_PAGE_DOWN, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4E }, + { KEY_EN_RIGHT_ARROW, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x4F }, + { KEY_EN_LEFT_ARROW, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x50 }, + { KEY_EN_DOWN_ARROW, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x51 }, + { KEY_EN_UP_ARROW, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x52 }, + { KEY_EN_ISO_BACK_SLASH, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { KEY_EN_MENU, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0x65 },//80 + { KEY_EN_LEFT_CONTROL, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE0 }, + { KEY_EN_LEFT_SHIFT, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE1 }, + { KEY_EN_LEFT_ALT, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE2 }, + { KEY_EN_LEFT_WINDOWS, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE3 }, + { KEY_EN_RIGHT_CONTROL, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE4 }, + { KEY_EN_RIGHT_SHIFT, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE5 }, + { KEY_EN_RIGHT_ALT, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE6 }, + { KEY_EN_RIGHT_FUNCTION, LOGITECH_GPRO_ZONE_DIRECT_KEYBOARD, 0xE7 }, { "Logo", LOGITECH_GPRO_ZONE_DIRECT_LOGO, 0x01 }, { "Lighting", LOGITECH_GPRO_ZONE_DIRECT_INDICATORS, 0x01 },//90 { "Game Mode", LOGITECH_GPRO_ZONE_DIRECT_INDICATORS, 0x02 }, diff --git a/Controllers/OpenRazerController/OpenRazerDevices.h b/Controllers/OpenRazerController/OpenRazerDevices.h index d7a4597a..45ed5408 100644 --- a/Controllers/OpenRazerController/OpenRazerDevices.h +++ b/Controllers/OpenRazerController/OpenRazerDevices.h @@ -2,6 +2,7 @@ #include #include "RGBController.h" +#include "RGBControllerKeyNames.h" typedef struct { @@ -41,116 +42,116 @@ static const razer_key blackwidow_chroma_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, { 0, 1, 0, "Key: M1" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, { 0, 2, 0, "Key: M2" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, { 0, 3, 0, "Key: M3" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, { 0, 4, 0, "Key: M4" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, { 0, 5, 0, "Key: M5" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define BLACKWIDOW_CHROMA_TE_KEYMAP_SIZE (sizeof(blackwidow_chroma_te_keymap) / sizeof(blackwidow_chroma_te_keymap[0])) @@ -160,94 +161,94 @@ static const razer_key blackwidow_chroma_te_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, }; #define BLADE_PRO_2017_KEYMAP_SIZE (sizeof(blade_pro_2017_keymap) / sizeof(blade_pro_2017_keymap[0])) @@ -257,91 +258,91 @@ static const razer_key blade_pro_2017_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 2, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Insert" }, - { 0, 0, 17, "Key: Delete" }, - { 0, 0, 19, "Key: Media Previous" }, - { 0, 0, 20, "Key: Media Next" }, + { 0, 0, 2, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_INSERT }, + { 0, 0, 17, KEY_EN_DELETE }, + { 0, 0, 19, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, { 0, 0, 21, "Key: Media Volume" }, - { 0, 0, 23, "Key: Media Play/Pause" }, - { 0, 0, 24, "Key: Media Mute" }, - { 0, 1, 2, "Key: `" }, - { 0, 1, 3, "Key: 1" }, - { 0, 1, 4, "Key: 2" }, - { 0, 1, 5, "Key: 3" }, - { 0, 1, 6, "Key: 4" }, - { 0, 1, 7, "Key: 5" }, - { 0, 1, 8, "Key: 6" }, - { 0, 1, 9, "Key: 7" }, - { 0, 1, 10, "Key: 8" }, - { 0, 1, 11, "Key: 9" }, - { 0, 1, 12, "Key: 0" }, - { 0, 1, 13, "Key: -" }, - { 0, 1, 14, "Key: =" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 2, "Key: Tab" }, - { 0, 2, 4, "Key: Q" }, - { 0, 2, 5, "Key: W" }, - { 0, 2, 6, "Key: E" }, - { 0, 2, 7, "Key: R" }, - { 0, 2, 8, "Key: T" }, - { 0, 2, 9, "Key: Y" }, - { 0, 2, 10, "Key: U" }, - { 0, 2, 11, "Key: I" }, - { 0, 2, 12, "Key: O" }, - { 0, 2, 13, "Key: P" }, - { 0, 2, 14, "Key: [" }, - { 0, 2, 15, "Key: ]" }, - { 0, 2, 17, "Key: \\ (ANSI)" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 4, "Key: A" }, - { 0, 3, 5, "Key: S" }, - { 0, 3, 6, "Key: D" }, - { 0, 3, 7, "Key: F" }, - { 0, 3, 8, "Key: G" }, - { 0, 3, 9, "Key: H" }, - { 0, 3, 10, "Key: J" }, - { 0, 3, 11, "Key: K" }, - { 0, 3, 12, "Key: L" }, - { 0, 3, 13, "Key: ;" }, - { 0, 3, 14, "Key: '" }, - { 0, 3, 18, "Key: Enter" }, - { 0, 4, 0, "Key: Left Shift" }, - { 0, 4, 4, "Key: Z" }, - { 0, 4, 5, "Key: X" }, - { 0, 4, 6, "Key: C" }, - { 0, 4, 7, "Key: V" }, - { 0, 4, 8, "Key: B" }, - { 0, 4, 9, "Key: N" }, - { 0, 4, 10, "Key: M" }, - { 0, 4, 11, "Key: ," }, - { 0, 4, 12, "Key: ." }, - { 0, 4, 13, "Key: /" }, - { 0, 4, 14, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Right Shift" }, - { 0, 5, 0, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Fn" }, - { 0, 5, 3, "Key: Left Windows" }, - { 0, 5, 5, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Control" }, - { 0, 5, 13, "Key: Left Arrow" }, - { 0, 5, 14, "Key: Down Arrow" }, - { 0, 5, 15, "Key: Right Arrow" }, - { 0, 5, 16, "Key: Right Fn" }, + { 0, 0, 23, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 24, KEY_EN_MEDIA_MUTE }, + { 0, 1, 2, KEY_EN_BACK_TICK }, + { 0, 1, 3, KEY_EN_1 }, + { 0, 1, 4, KEY_EN_2 }, + { 0, 1, 5, KEY_EN_3 }, + { 0, 1, 6, KEY_EN_4 }, + { 0, 1, 7, KEY_EN_5 }, + { 0, 1, 8, KEY_EN_6 }, + { 0, 1, 9, KEY_EN_7 }, + { 0, 1, 10, KEY_EN_8 }, + { 0, 1, 11, KEY_EN_9 }, + { 0, 1, 12, KEY_EN_0 }, + { 0, 1, 13, KEY_EN_MINUS }, + { 0, 1, 14, KEY_EN_EQUALS }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 2, KEY_EN_TAB }, + { 0, 2, 4, KEY_EN_Q }, + { 0, 2, 5, KEY_EN_W }, + { 0, 2, 6, KEY_EN_E }, + { 0, 2, 7, KEY_EN_R }, + { 0, 2, 8, KEY_EN_T }, + { 0, 2, 9, KEY_EN_Y }, + { 0, 2, 10, KEY_EN_U }, + { 0, 2, 11, KEY_EN_I }, + { 0, 2, 12, KEY_EN_O }, + { 0, 2, 13, KEY_EN_P }, + { 0, 2, 14, KEY_EN_LEFT_BRACKET }, + { 0, 2, 15, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 17, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 4, KEY_EN_A }, + { 0, 3, 5, KEY_EN_S }, + { 0, 3, 6, KEY_EN_D }, + { 0, 3, 7, KEY_EN_F }, + { 0, 3, 8, KEY_EN_G }, + { 0, 3, 9, KEY_EN_H }, + { 0, 3, 10, KEY_EN_J }, + { 0, 3, 11, KEY_EN_K }, + { 0, 3, 12, KEY_EN_L }, + { 0, 3, 13, KEY_EN_SEMICOLON }, + { 0, 3, 14, KEY_EN_QUOTE }, + { 0, 3, 18, KEY_EN_ANSI_ENTER }, + { 0, 4, 0, KEY_EN_LEFT_SHIFT }, + { 0, 4, 4, KEY_EN_Z }, + { 0, 4, 5, KEY_EN_X }, + { 0, 4, 6, KEY_EN_C }, + { 0, 4, 7, KEY_EN_V }, + { 0, 4, 8, KEY_EN_B }, + { 0, 4, 9, KEY_EN_N }, + { 0, 4, 10, KEY_EN_M }, + { 0, 4, 11, KEY_EN_COMMA }, + { 0, 4, 12, KEY_EN_PERIOD }, + { 0, 4, 13, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 0, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 3, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 5, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 13, KEY_EN_LEFT_ARROW }, + { 0, 5, 14, KEY_EN_DOWN_ARROW }, + { 0, 5, 15, KEY_EN_RIGHT_ARROW }, + { 0, 5, 16, KEY_EN_RIGHT_FUNCTION }, }; #define BLADE_STEALTH_KEYMAP_SIZE (sizeof(blade_stealth_keymap) / sizeof(blade_stealth_keymap[0])) @@ -351,93 +352,93 @@ static const razer_key blade_stealth_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 2, "Key: F1" }, - { 0, 0, 3, "Key: F2" }, - { 0, 0, 4, "Key: F3" }, - { 0, 0, 5, "Key: F4" }, - { 0, 0, 6, "Key: F5" }, - { 0, 0, 7, "Key: F6" }, - { 0, 0, 8, "Key: F7" }, - { 0, 0, 9, "Key: F8" }, - { 0, 0, 10, "Key: F9" }, - { 0, 0, 11, "Key: F10" }, - { 0, 0, 12, "Key: F11" }, - { 0, 0, 13, "Key: F12" }, - { 0, 0, 14, "Key: Insert" }, - { 0, 0, 15, "Key: Delete" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 0, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: \\ (ANSI)" }, - { 0, 3, 0, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 15, "Key: Enter" }, - { 0, 4, 0, "Key: Left Shift" }, - { 0, 4, 2, "Key: Z" }, - { 0, 4, 3, "Key: X" }, - { 0, 4, 4, "Key: C" }, - { 0, 4, 5, "Key: V" }, - { 0, 4, 6, "Key: B" }, - { 0, 4, 7, "Key: N" }, - { 0, 4, 8, "Key: M" }, - { 0, 4, 9, "Key: ," }, - { 0, 4, 10, "Key: ." }, - { 0, 4, 11, "Key: /" }, - { 0, 4, 12, "Key: Right Shift" }, - { 0, 4, 13, "Key: Right Shift" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 5, 0, "Key: Left Control" }, - { 0, 5, 1, "Key: Left Fn" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 5, "Key: Space" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 8, "Key: Space" }, - { 0, 5, 9, "Key: Right Alt" }, - { 0, 5, 10, "Key: Right Fn" }, - { 0, 5, 11, "Key: Right Control" }, - { 0, 5, 12, "Key: Left Arrow" }, - { 0, 5, 13, "Key: Up Arrow" }, - { 0, 5, 14, "Key: Right Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_F1 }, + { 0, 0, 3, KEY_EN_F2 }, + { 0, 0, 4, KEY_EN_F3 }, + { 0, 0, 5, KEY_EN_F4 }, + { 0, 0, 6, KEY_EN_F5 }, + { 0, 0, 7, KEY_EN_F6 }, + { 0, 0, 8, KEY_EN_F7 }, + { 0, 0, 9, KEY_EN_F8 }, + { 0, 0, 10, KEY_EN_F9 }, + { 0, 0, 11, KEY_EN_F10 }, + { 0, 0, 12, KEY_EN_F11 }, + { 0, 0, 13, KEY_EN_F12 }, + { 0, 0, 14, KEY_EN_INSERT }, + { 0, 0, 15, KEY_EN_DELETE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 0, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 0, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 15, KEY_EN_ANSI_ENTER }, + { 0, 4, 0, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_Z }, + { 0, 4, 3, KEY_EN_X }, + { 0, 4, 4, KEY_EN_C }, + { 0, 4, 5, KEY_EN_V }, + { 0, 4, 6, KEY_EN_B }, + { 0, 4, 7, KEY_EN_N }, + { 0, 4, 8, KEY_EN_M }, + { 0, 4, 9, KEY_EN_COMMA }, + { 0, 4, 10, KEY_EN_PERIOD }, + { 0, 4, 11, KEY_EN_FORWARD_SLASH }, + { 0, 4, 12, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 13, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 0, KEY_EN_LEFT_CONTROL }, + { 0, 5, 1, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 5, KEY_EN_SPACE }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 8, KEY_EN_SPACE }, + { 0, 5, 9, KEY_EN_RIGHT_ALT }, + { 0, 5, 10, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 11, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 12, KEY_EN_LEFT_ARROW }, + { 0, 5, 13, KEY_EN_UP_ARROW }, + { 0, 5, 14, KEY_EN_RIGHT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, }; #define CYNOSA_CHROMA_KEYMAP_SIZE (sizeof(cynosa_chroma_keymap) / sizeof(cynosa_chroma_keymap[0])) @@ -447,113 +448,113 @@ static const razer_key cynosa_chroma_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_ELITE_KEYMAP_SIZE (sizeof(huntsman_elite_keymap) / sizeof(huntsman_elite_keymap[0])) @@ -563,116 +564,116 @@ static const razer_key huntsman_elite_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 0, 18, "Key: Media Previous" }, - { 0, 0, 19, "Key: Media Play/Pause" }, - { 0, 0, 20, "Key: Media Next" }, - { 0, 0, 21, "Key: Media Mute" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 0, 18, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 19, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, + { 0, 0, 21, KEY_EN_MEDIA_MUTE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_KEYMAP_SIZE (sizeof(huntsman_keymap) / sizeof(huntsman_keymap[0])) @@ -682,112 +683,112 @@ static const razer_key huntsman_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_TE_KEYMAP_SIZE (sizeof(huntsman_te_keymap) / sizeof(huntsman_te_keymap[0])) @@ -797,95 +798,95 @@ static const razer_key huntsman_te_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, }; #define BLACKWIDOW_ELITE_KEYMAP_SIZE (sizeof(blackwidow_elite_keymap) / sizeof(blackwidow_elite_keymap[0])) @@ -895,117 +896,117 @@ static const razer_key blackwidow_elite_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 0, 18, "Key: Media Previous" }, - { 0, 0, 19, "Key: Media Play/Pause" }, - { 0, 0, 20, "Key: Media Next" }, - { 0, 0, 21, "Key: Media Mute" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 0, 18, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 19, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, + { 0, 0, 21, KEY_EN_MEDIA_MUTE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, { 0, 5, 11, "Logo" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define BLACKWIDOW_2019_KEYMAP_SIZE (sizeof(blackwidow_2019_keymap) / sizeof(blackwidow_2019_keymap[0])) @@ -1015,112 +1016,112 @@ static const razer_key blackwidow_2019_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, { 0, 5, 11, "Logo" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, { 0, 5, 20, "Key: Number Pad ," }, }; @@ -1131,112 +1132,112 @@ static const razer_key ornata_chroma_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define BLACKWIDOW_CHROMA_V2_KEYMAP_SIZE (sizeof(blackwidow_chroma_v2_keymap) / sizeof(blackwidow_chroma_v2_keymap[0])) @@ -1246,116 +1247,116 @@ static const razer_key blackwidow_chroma_v2_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, { 0, 1, 0, "Key: M1" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, { 0, 2, 0, "Key: M2" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, { 0, 3, 0, "Key: M3" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, { 0, 4, 0, "Key: M4" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, { 0, 5, 0, "Key: M5" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; /*-------------------------------------------------------------------------*\ diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.cpp index 80801d4b..6d53a301 100644 --- a/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.cpp +++ b/Controllers/QMKOpenRGBController/QMKOpenRGBRev9Controller.cpp @@ -9,56 +9,58 @@ | Jath03 28th May 2021 | \*-------------------------------------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "QMKOpenRGBRev9Controller.h" using namespace std::chrono_literals; static std::map QMKKeycodeToKeynameMap { - { 0, "" }, { 1, "Right Fn" }, { 2, "" }, { 3, "" }, - { 4, "A" }, { 5, "B" }, { 6, "C" }, { 7, "D" }, - { 8, "E" }, { 9, "F" }, { 10, "G" }, { 11, "H" }, - { 12, "I" }, { 13, "J" }, { 14, "K" }, { 15, "L" }, - { 16, "M" }, { 17, "N" }, { 18, "O" }, { 19, "P" }, - { 20, "Q" }, { 21, "R" }, { 22, "S" }, { 23, "T" }, - { 24, "U" }, { 25, "V" }, { 26, "W" }, { 27, "X" }, - { 28, "Y" }, { 29, "Z" }, { 30, "1" }, { 31, "2" }, - { 32, "3" }, { 33, "4" }, { 34, "5" }, { 35, "6" }, - { 36, "7" }, { 37, "8" }, { 38, "9" }, { 39, "0" }, - { 40, "Enter" }, { 41, "Escape" }, { 42, "Backspace" }, { 43, "Tab" }, - { 44, "Space" }, { 45, "-" }, { 46, "=" }, { 47, "[" }, - { 48, "]" }, { 49, "\\ (ANSI)" }, { 50, "" }, { 51, ";" }, - { 52, "'" }, { 53, "`" }, { 54, "," }, { 55, "." }, - { 56, "/" }, { 57, "Caps Lock" }, { 58, "F1" }, { 59, "F2" }, - { 60, "F3" }, { 61, "F4" }, { 62, "F5" }, { 63, "F6" }, - { 64, "F7" }, { 65, "F8" }, { 66, "F9" }, { 67, "F10" }, - { 68, "F11" }, { 69, "F12" }, { 70, "Print Screen" }, { 71, "Scroll Lock" }, - { 72, "Pause/Break" }, { 73, "Insert" }, { 74, "Home" }, { 75, "Page Up" }, - { 76, "Delete" }, { 77, "End" }, { 78, "Page Down" }, { 79, "Right Arrow" }, - { 80, "Left Arrow" }, { 81, "Down Arrow" }, { 82, "Up Arrow" }, { 83, "Num Lock" }, - { 84, "Number Pad /" }, { 85, "Number Pad *" }, { 86, "Number Pad -" }, { 87, "Number Pad +" }, - { 88, "Number Pad Enter" }, { 89, "Number Pad 1" }, { 90, "Number Pad 2" }, { 91, "Number Pad 3" }, - { 92, "Number Pad 4" }, { 93, "Number Pad 5" }, { 94, "Number Pad 6" }, { 95, "Number Pad 7" }, - { 96, "Number Pad 8" }, { 97, "Number Pad 9" }, { 98, "Number Pad 0" }, { 99, "Number Pad ." }, - { 100, "" }, { 101, "Menu" }, { 102, "" }, { 103, "" }, - { 104, "" }, { 105, "" }, { 106, "" }, { 107, "" }, - { 108, "" }, { 109, "" }, { 110, "" }, { 111, "" }, - { 112, "" }, { 113, "" }, { 114, "" }, { 115, "" }, - { 116, "" }, { 117, "" }, { 118, "" }, { 119, "" }, - { 120, "" }, { 121, "" }, { 122, "" }, { 123, "" }, - { 124, "" }, { 125, "" }, { 126, "" }, { 127, "" }, - { 128, "" }, { 129, "" }, { 130, "" }, { 131, "" }, - { 132, "" }, { 133, "" }, { 134, "" }, { 135, "" }, - { 136, "" }, { 137, "" }, { 138, "" }, { 139, "" }, - { 140, "" }, { 141, "" }, { 142, "" }, { 143, "" }, - { 144, "" }, { 145, "" }, { 146, "" }, { 147, "" }, - { 148, "" }, { 149, "" }, { 150, "" }, { 151, "" }, - { 152, "" }, { 153, "" }, { 154, "" }, { 155, "" }, - { 156, "" }, { 157, "" }, { 158, "" }, { 159, "" }, - { 160, "" }, { 161, "" }, { 162, "" }, { 163, "" }, { 164, "" }, - /*Space Cadet Left Shift*/ { 216, "Left Shift"}, /*Space Cadet Right Shift*/ { 217, "Right Shift"}, - { 224, "Left Control" }, { 225, "Left Shift" }, { 226, "Left Alt" }, { 227, "Left Windows" }, - { 228, "Right Control" }, { 229, "Right Shift" }, { 230, "Right Alt" }, { 231, "Right Windows" }, + { 0, KEY_EN_UNUSED }, { 1, KEY_EN_RIGHT_FUNCTION }, { 2, KEY_EN_UNUSED }, { 3, KEY_EN_UNUSED }, + { 4, KEY_EN_A }, { 5, KEY_EN_B }, { 6, KEY_EN_C }, { 7, KEY_EN_D }, + { 8, KEY_EN_E }, { 9, KEY_EN_F }, { 10, KEY_EN_G }, { 11, KEY_EN_H }, + { 12, KEY_EN_I }, { 13, KEY_EN_J }, { 14, KEY_EN_K }, { 15, KEY_EN_L }, + { 16, KEY_EN_M }, { 17, KEY_EN_N }, { 18, KEY_EN_O }, { 19, KEY_EN_P }, + { 20, KEY_EN_Q }, { 21, KEY_EN_R }, { 22, KEY_EN_S }, { 23, KEY_EN_T }, + { 24, KEY_EN_U }, { 25, KEY_EN_V }, { 26, KEY_EN_W }, { 27, KEY_EN_X }, + { 28, KEY_EN_Y }, { 29, KEY_EN_Z }, { 30, KEY_EN_1 }, { 31, KEY_EN_2 }, + { 32, KEY_EN_3 }, { 33, KEY_EN_4 }, { 34, KEY_EN_5 }, { 35, KEY_EN_6 }, + { 36, KEY_EN_7 }, { 37, KEY_EN_8 }, { 38, KEY_EN_9 }, { 39, KEY_EN_0 }, + { 40, KEY_EN_ANSI_ENTER }, { 41, KEY_EN_ESCAPE }, { 42, KEY_EN_BACKSPACE }, { 43, KEY_EN_TAB }, + { 44, KEY_EN_SPACE }, { 45, KEY_EN_MINUS }, { 46, KEY_EN_EQUALS }, { 47, KEY_EN_LEFT_BRACKET }, + { 48, KEY_EN_RIGHT_BRACKET }, { 49, KEY_EN_ANSI_BACK_SLASH }, { 50, KEY_EN_UNUSED }, { 51, KEY_EN_SEMICOLON }, + { 52, KEY_EN_QUOTE }, { 53, KEY_EN_BACK_TICK }, { 54, KEY_EN_COMMA }, { 55, KEY_EN_PERIOD }, + { 56, KEY_EN_FORWARD_SLASH }, { 57, KEY_EN_CAPS_LOCK }, { 58, KEY_EN_F1 }, { 59, KEY_EN_F2 }, + { 60, KEY_EN_F3 }, { 61, KEY_EN_F4 }, { 62, KEY_EN_F5 }, { 63, KEY_EN_F6 }, + { 64, KEY_EN_F7 }, { 65, KEY_EN_F8 }, { 66, KEY_EN_F9 }, { 67, KEY_EN_F10 }, + { 68, KEY_EN_F11 }, { 69, KEY_EN_F12 }, { 70, KEY_EN_PRINT_SCREEN }, { 71, KEY_EN_SCROLL_LOCK }, + { 72, KEY_EN_PAUSE_BREAK }, { 73, KEY_EN_INSERT }, { 74, KEY_EN_HOME }, { 75, KEY_EN_PAGE_UP }, + { 76, KEY_EN_DELETE }, { 77, KEY_EN_END }, { 78, KEY_EN_PAGE_DOWN }, { 79, KEY_EN_RIGHT_ARROW }, + { 80, KEY_EN_LEFT_ARROW }, { 81, KEY_EN_DOWN_ARROW }, { 82, KEY_EN_UP_ARROW }, { 83, KEY_EN_NUMPAD_LOCK }, + { 84, KEY_EN_NUMPAD_DIVIDE }, { 85, KEY_EN_NUMPAD_TIMES }, { 86, KEY_EN_NUMPAD_MINUS }, { 87, KEY_EN_NUMPAD_PLUS }, + { 88, KEY_EN_NUMPAD_ENTER }, { 89, KEY_EN_NUMPAD_1 }, { 90, KEY_EN_NUMPAD_2 }, { 91, KEY_EN_NUMPAD_3 }, + { 92, KEY_EN_NUMPAD_4 }, { 93, KEY_EN_NUMPAD_5 }, { 94, KEY_EN_NUMPAD_6 }, { 95, KEY_EN_NUMPAD_7 }, + { 96, KEY_EN_NUMPAD_8 }, { 97, KEY_EN_NUMPAD_9 }, { 98, KEY_EN_NUMPAD_0 }, { 99, KEY_EN_NUMPAD_PERIOD }, + { 100, KEY_EN_UNUSED }, { 101, KEY_EN_MENU }, { 102, KEY_EN_UNUSED }, { 103, KEY_EN_UNUSED }, + { 104, KEY_EN_UNUSED }, { 105, KEY_EN_UNUSED }, { 106, KEY_EN_UNUSED }, { 107, KEY_EN_UNUSED }, + { 108, KEY_EN_UNUSED }, { 109, KEY_EN_UNUSED }, { 110, KEY_EN_UNUSED }, { 111, KEY_EN_UNUSED }, + { 112, KEY_EN_UNUSED }, { 113, KEY_EN_UNUSED }, { 114, KEY_EN_UNUSED }, { 115, KEY_EN_UNUSED }, + { 116, KEY_EN_UNUSED }, { 117, KEY_EN_UNUSED }, { 118, KEY_EN_UNUSED }, { 119, KEY_EN_UNUSED }, + { 120, KEY_EN_UNUSED }, { 121, KEY_EN_UNUSED }, { 122, KEY_EN_UNUSED }, { 123, KEY_EN_UNUSED }, + { 124, KEY_EN_UNUSED }, { 125, KEY_EN_UNUSED }, { 126, KEY_EN_UNUSED }, { 127, KEY_EN_UNUSED }, + { 128, KEY_EN_UNUSED }, { 129, KEY_EN_UNUSED }, { 130, KEY_EN_UNUSED }, { 131, KEY_EN_UNUSED }, + { 132, KEY_EN_UNUSED }, { 133, KEY_EN_UNUSED }, { 134, KEY_EN_UNUSED }, { 135, KEY_EN_UNUSED }, + { 136, KEY_EN_UNUSED }, { 137, KEY_EN_UNUSED }, { 138, KEY_EN_UNUSED }, { 139, KEY_EN_UNUSED }, + { 140, KEY_EN_UNUSED }, { 141, KEY_EN_UNUSED }, { 142, KEY_EN_UNUSED }, { 143, KEY_EN_UNUSED }, + { 144, KEY_EN_UNUSED }, { 145, KEY_EN_UNUSED }, { 146, KEY_EN_UNUSED }, { 147, KEY_EN_UNUSED }, + { 148, KEY_EN_UNUSED }, { 149, KEY_EN_UNUSED }, { 150, KEY_EN_UNUSED }, { 151, KEY_EN_UNUSED }, + { 152, KEY_EN_UNUSED }, { 153, KEY_EN_UNUSED }, { 154, KEY_EN_UNUSED }, { 155, KEY_EN_UNUSED }, + { 156, KEY_EN_UNUSED }, { 157, KEY_EN_UNUSED }, { 158, KEY_EN_UNUSED }, { 159, KEY_EN_UNUSED }, + { 160, KEY_EN_UNUSED }, { 161, KEY_EN_UNUSED }, { 162, KEY_EN_UNUSED }, { 163, KEY_EN_UNUSED }, + { 164, KEY_EN_UNUSED }, + /*Space Cadet Left Shift*/ { 216, KEY_EN_LEFT_SHIFT }, /*Space Cadet Right Shift*/ { 217, KEY_EN_RIGHT_SHIFT }, + { 224, KEY_EN_LEFT_CONTROL }, { 225, KEY_EN_LEFT_SHIFT }, { 226, KEY_EN_LEFT_ALT }, { 227, KEY_EN_LEFT_WINDOWS }, + { 228, KEY_EN_RIGHT_CONTROL }, { 229, KEY_EN_RIGHT_SHIFT }, { 230, KEY_EN_RIGHT_ALT }, { 231, KEY_EN_RIGHT_WINDOWS }, }; QMKOpenRGBRev9Controller::QMKOpenRGBRev9Controller(hid_device *dev_handle, const char *path) @@ -337,11 +339,11 @@ void QMKOpenRGBRev9Controller::GetLEDInfo(unsigned int led) { if (QMKKeycodeToKeynameMap.count(usb_buf[QMK_OPENRGB_KEYCODE_BYTE]) > 0) { - led_names.push_back("Key: " + QMKKeycodeToKeynameMap[usb_buf[QMK_OPENRGB_KEYCODE_BYTE]]); + led_names.push_back(QMKKeycodeToKeynameMap[usb_buf[QMK_OPENRGB_KEYCODE_BYTE]]); } else { - led_names.push_back("Key: "); + led_names.push_back(KEY_EN_UNUSED); } } } diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.cpp index 9e07e171..a35e1625 100644 --- a/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.cpp +++ b/Controllers/QMKOpenRGBController/QMKOpenRGBRevBController.cpp @@ -7,56 +7,58 @@ | Jath03 28th May 2021 | \*-------------------------------------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "QMKOpenRGBRevBController.h" using namespace std::chrono_literals; static std::map QMKKeycodeToKeynameMap { - { 0, "" }, { 1, "Right Fn" }, { 2, "" }, { 3, "" }, - { 4, "A" }, { 5, "B" }, { 6, "C" }, { 7, "D" }, - { 8, "E" }, { 9, "F" }, { 10, "G" }, { 11, "H" }, - { 12, "I" }, { 13, "J" }, { 14, "K" }, { 15, "L" }, - { 16, "M" }, { 17, "N" }, { 18, "O" }, { 19, "P" }, - { 20, "Q" }, { 21, "R" }, { 22, "S" }, { 23, "T" }, - { 24, "U" }, { 25, "V" }, { 26, "W" }, { 27, "X" }, - { 28, "Y" }, { 29, "Z" }, { 30, "1" }, { 31, "2" }, - { 32, "3" }, { 33, "4" }, { 34, "5" }, { 35, "6" }, - { 36, "7" }, { 37, "8" }, { 38, "9" }, { 39, "0" }, - { 40, "Enter" }, { 41, "Escape" }, { 42, "Backspace" }, { 43, "Tab" }, - { 44, "Space" }, { 45, "-" }, { 46, "=" }, { 47, "[" }, - { 48, "]" }, { 49, "\\ (ANSI)" }, { 50, "" }, { 51, ";" }, - { 52, "'" }, { 53, "`" }, { 54, "," }, { 55, "." }, - { 56, "/" }, { 57, "Caps Lock" }, { 58, "F1" }, { 59, "F2" }, - { 60, "F3" }, { 61, "F4" }, { 62, "F5" }, { 63, "F6" }, - { 64, "F7" }, { 65, "F8" }, { 66, "F9" }, { 67, "F10" }, - { 68, "F11" }, { 69, "F12" }, { 70, "Print Screen" }, { 71, "Scroll Lock" }, - { 72, "Pause/Break" }, { 73, "Insert" }, { 74, "Home" }, { 75, "Page Up" }, - { 76, "Delete" }, { 77, "End" }, { 78, "Page Down" }, { 79, "Right Arrow" }, - { 80, "Left Arrow" }, { 81, "Down Arrow" }, { 82, "Up Arrow" }, { 83, "Num Lock" }, - { 84, "Number Pad /" }, { 85, "Number Pad *" }, { 86, "Number Pad -" }, { 87, "Number Pad +" }, - { 88, "Number Pad Enter" }, { 89, "Number Pad 1" }, { 90, "Number Pad 2" }, { 91, "Number Pad 3" }, - { 92, "Number Pad 4" }, { 93, "Number Pad 5" }, { 94, "Number Pad 6" }, { 95, "Number Pad 7" }, - { 96, "Number Pad 8" }, { 97, "Number Pad 9" }, { 98, "Number Pad 0" }, { 99, "Number Pad ." }, - { 100, "" }, { 101, "Menu" }, { 102, "" }, { 103, "" }, - { 104, "" }, { 105, "" }, { 106, "" }, { 107, "" }, - { 108, "" }, { 109, "" }, { 110, "" }, { 111, "" }, - { 112, "" }, { 113, "" }, { 114, "" }, { 115, "" }, - { 116, "" }, { 117, "" }, { 118, "" }, { 119, "" }, - { 120, "" }, { 121, "" }, { 122, "" }, { 123, "" }, - { 124, "" }, { 125, "" }, { 126, "" }, { 127, "" }, - { 128, "" }, { 129, "" }, { 130, "" }, { 131, "" }, - { 132, "" }, { 133, "" }, { 134, "" }, { 135, "" }, - { 136, "" }, { 137, "" }, { 138, "" }, { 139, "" }, - { 140, "" }, { 141, "" }, { 142, "" }, { 143, "" }, - { 144, "" }, { 145, "" }, { 146, "" }, { 147, "" }, - { 148, "" }, { 149, "" }, { 150, "" }, { 151, "" }, - { 152, "" }, { 153, "" }, { 154, "" }, { 155, "" }, - { 156, "" }, { 157, "" }, { 158, "" }, { 159, "" }, - { 160, "" }, { 161, "" }, { 162, "" }, { 163, "" }, { 164, "" }, - /*Space Cadet Left Shift*/ { 216, "Left Shift"}, /*Space Cadet Right Shift*/ { 217, "Right Shift"}, - { 224, "Left Control" }, { 225, "Left Shift" }, { 226, "Left Alt" }, { 227, "Left Windows" }, - { 228, "Right Control" }, { 229, "Right Shift" }, { 230, "Right Alt" }, { 231, "Right Windows" }, + { 0, KEY_EN_UNUSED }, { 1, KEY_EN_RIGHT_FUNCTION }, { 2, KEY_EN_UNUSED }, { 3, KEY_EN_UNUSED }, + { 4, KEY_EN_A }, { 5, KEY_EN_B }, { 6, KEY_EN_C }, { 7, KEY_EN_D }, + { 8, KEY_EN_E }, { 9, KEY_EN_F }, { 10, KEY_EN_G }, { 11, KEY_EN_H }, + { 12, KEY_EN_I }, { 13, KEY_EN_J }, { 14, KEY_EN_K }, { 15, KEY_EN_L }, + { 16, KEY_EN_M }, { 17, KEY_EN_N }, { 18, KEY_EN_O }, { 19, KEY_EN_P }, + { 20, KEY_EN_Q }, { 21, KEY_EN_R }, { 22, KEY_EN_S }, { 23, KEY_EN_T }, + { 24, KEY_EN_U }, { 25, KEY_EN_V }, { 26, KEY_EN_W }, { 27, KEY_EN_X }, + { 28, KEY_EN_Y }, { 29, KEY_EN_Z }, { 30, KEY_EN_1 }, { 31, KEY_EN_2 }, + { 32, KEY_EN_3 }, { 33, KEY_EN_4 }, { 34, KEY_EN_5 }, { 35, KEY_EN_6 }, + { 36, KEY_EN_7 }, { 37, KEY_EN_8 }, { 38, KEY_EN_9 }, { 39, KEY_EN_0 }, + { 40, KEY_EN_ANSI_ENTER }, { 41, KEY_EN_ESCAPE }, { 42, KEY_EN_BACKSPACE }, { 43, KEY_EN_TAB }, + { 44, KEY_EN_SPACE }, { 45, KEY_EN_MINUS }, { 46, KEY_EN_EQUALS }, { 47, KEY_EN_LEFT_BRACKET }, + { 48, KEY_EN_RIGHT_BRACKET }, { 49, KEY_EN_ANSI_BACK_SLASH }, { 50, KEY_EN_UNUSED }, { 51, KEY_EN_SEMICOLON }, + { 52, KEY_EN_QUOTE }, { 53, KEY_EN_BACK_TICK }, { 54, KEY_EN_COMMA }, { 55, KEY_EN_PERIOD }, + { 56, KEY_EN_FORWARD_SLASH }, { 57, KEY_EN_CAPS_LOCK }, { 58, KEY_EN_F1 }, { 59, KEY_EN_F2 }, + { 60, KEY_EN_F3 }, { 61, KEY_EN_F4 }, { 62, KEY_EN_F5 }, { 63, KEY_EN_F6 }, + { 64, KEY_EN_F7 }, { 65, KEY_EN_F8 }, { 66, KEY_EN_F9 }, { 67, KEY_EN_F10 }, + { 68, KEY_EN_F11 }, { 69, KEY_EN_F12 }, { 70, KEY_EN_PRINT_SCREEN }, { 71, KEY_EN_SCROLL_LOCK }, + { 72, KEY_EN_PAUSE_BREAK }, { 73, KEY_EN_INSERT }, { 74, KEY_EN_HOME }, { 75, KEY_EN_PAGE_UP }, + { 76, KEY_EN_DELETE }, { 77, KEY_EN_END }, { 78, KEY_EN_PAGE_DOWN }, { 79, KEY_EN_RIGHT_ARROW }, + { 80, KEY_EN_LEFT_ARROW }, { 81, KEY_EN_DOWN_ARROW }, { 82, KEY_EN_UP_ARROW }, { 83, KEY_EN_NUMPAD_LOCK }, + { 84, KEY_EN_NUMPAD_DIVIDE }, { 85, KEY_EN_NUMPAD_TIMES }, { 86, KEY_EN_NUMPAD_MINUS }, { 87, KEY_EN_NUMPAD_PLUS }, + { 88, KEY_EN_NUMPAD_ENTER }, { 89, KEY_EN_NUMPAD_1 }, { 90, KEY_EN_NUMPAD_2 }, { 91, KEY_EN_NUMPAD_3 }, + { 92, KEY_EN_NUMPAD_4 }, { 93, KEY_EN_NUMPAD_5 }, { 94, KEY_EN_NUMPAD_6 }, { 95, KEY_EN_NUMPAD_7 }, + { 96, KEY_EN_NUMPAD_8 }, { 97, KEY_EN_NUMPAD_9 }, { 98, KEY_EN_NUMPAD_0 }, { 99, KEY_EN_NUMPAD_PERIOD }, + { 100, KEY_EN_UNUSED }, { 101, KEY_EN_MENU }, { 102, KEY_EN_UNUSED }, { 103, KEY_EN_UNUSED }, + { 104, KEY_EN_UNUSED }, { 105, KEY_EN_UNUSED }, { 106, KEY_EN_UNUSED }, { 107, KEY_EN_UNUSED }, + { 108, KEY_EN_UNUSED }, { 109, KEY_EN_UNUSED }, { 110, KEY_EN_UNUSED }, { 111, KEY_EN_UNUSED }, + { 112, KEY_EN_UNUSED }, { 113, KEY_EN_UNUSED }, { 114, KEY_EN_UNUSED }, { 115, KEY_EN_UNUSED }, + { 116, KEY_EN_UNUSED }, { 117, KEY_EN_UNUSED }, { 118, KEY_EN_UNUSED }, { 119, KEY_EN_UNUSED }, + { 120, KEY_EN_UNUSED }, { 121, KEY_EN_UNUSED }, { 122, KEY_EN_UNUSED }, { 123, KEY_EN_UNUSED }, + { 124, KEY_EN_UNUSED }, { 125, KEY_EN_UNUSED }, { 126, KEY_EN_UNUSED }, { 127, KEY_EN_UNUSED }, + { 128, KEY_EN_UNUSED }, { 129, KEY_EN_UNUSED }, { 130, KEY_EN_UNUSED }, { 131, KEY_EN_UNUSED }, + { 132, KEY_EN_UNUSED }, { 133, KEY_EN_UNUSED }, { 134, KEY_EN_UNUSED }, { 135, KEY_EN_UNUSED }, + { 136, KEY_EN_UNUSED }, { 137, KEY_EN_UNUSED }, { 138, KEY_EN_UNUSED }, { 139, KEY_EN_UNUSED }, + { 140, KEY_EN_UNUSED }, { 141, KEY_EN_UNUSED }, { 142, KEY_EN_UNUSED }, { 143, KEY_EN_UNUSED }, + { 144, KEY_EN_UNUSED }, { 145, KEY_EN_UNUSED }, { 146, KEY_EN_UNUSED }, { 147, KEY_EN_UNUSED }, + { 148, KEY_EN_UNUSED }, { 149, KEY_EN_UNUSED }, { 150, KEY_EN_UNUSED }, { 151, KEY_EN_UNUSED }, + { 152, KEY_EN_UNUSED }, { 153, KEY_EN_UNUSED }, { 154, KEY_EN_UNUSED }, { 155, KEY_EN_UNUSED }, + { 156, KEY_EN_UNUSED }, { 157, KEY_EN_UNUSED }, { 158, KEY_EN_UNUSED }, { 159, KEY_EN_UNUSED }, + { 160, KEY_EN_UNUSED }, { 161, KEY_EN_UNUSED }, { 162, KEY_EN_UNUSED }, { 163, KEY_EN_UNUSED }, + { 164, KEY_EN_UNUSED }, + /*Space Cadet Left Shift*/ { 216, KEY_EN_LEFT_SHIFT }, /*Space Cadet Right Shift*/ { 217, KEY_EN_RIGHT_SHIFT }, + { 224, KEY_EN_LEFT_CONTROL }, { 225, KEY_EN_LEFT_SHIFT }, { 226, KEY_EN_LEFT_ALT }, { 227, KEY_EN_LEFT_WINDOWS }, + { 228, KEY_EN_RIGHT_CONTROL }, { 229, KEY_EN_RIGHT_SHIFT }, { 230, KEY_EN_RIGHT_ALT }, { 231, KEY_EN_RIGHT_WINDOWS }, }; QMKOpenRGBRevBController::QMKOpenRGBRevBController(hid_device *dev_handle, const char *path) @@ -348,11 +350,11 @@ void QMKOpenRGBRevBController::GetLEDInfo(unsigned int leds_count) { if (QMKKeycodeToKeynameMap.count(usb_buf[(led_idx * 7) + QMK_OPENRGB_KEYCODE_BYTE]) > 0) { - led_names.push_back("Key: " + QMKKeycodeToKeynameMap[usb_buf[(led_idx * 7) + QMK_OPENRGB_KEYCODE_BYTE]]); + led_names.push_back(QMKKeycodeToKeynameMap[usb_buf[(led_idx * 7) + QMK_OPENRGB_KEYCODE_BYTE]]); } else { - led_names.push_back("Key: "); + led_names.push_back(KEY_EN_UNUSED); } } } @@ -491,4 +493,4 @@ void QMKOpenRGBRevBController::DirectModeSetLEDs(std::vector colors, u leds_sent += tmp_leds_per_update; } -} \ No newline at end of file +} diff --git a/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.cpp b/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.cpp index 8cd939e7..313f6c1d 100644 --- a/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.cpp +++ b/Controllers/QMKOpenRGBController/QMKOpenRGBRevDController.cpp @@ -7,56 +7,58 @@ | Jath03 28th May 2021 | \*-------------------------------------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "QMKOpenRGBRevDController.h" using namespace std::chrono_literals; static std::map QMKKeycodeToKeynameMap { - { 0, "" }, { 1, "Right Fn" }, { 2, "" }, { 3, "" }, - { 4, "A" }, { 5, "B" }, { 6, "C" }, { 7, "D" }, - { 8, "E" }, { 9, "F" }, { 10, "G" }, { 11, "H" }, - { 12, "I" }, { 13, "J" }, { 14, "K" }, { 15, "L" }, - { 16, "M" }, { 17, "N" }, { 18, "O" }, { 19, "P" }, - { 20, "Q" }, { 21, "R" }, { 22, "S" }, { 23, "T" }, - { 24, "U" }, { 25, "V" }, { 26, "W" }, { 27, "X" }, - { 28, "Y" }, { 29, "Z" }, { 30, "1" }, { 31, "2" }, - { 32, "3" }, { 33, "4" }, { 34, "5" }, { 35, "6" }, - { 36, "7" }, { 37, "8" }, { 38, "9" }, { 39, "0" }, - { 40, "Enter" }, { 41, "Escape" }, { 42, "Backspace" }, { 43, "Tab" }, - { 44, "Space" }, { 45, "-" }, { 46, "=" }, { 47, "[" }, - { 48, "]" }, { 49, "\\ (ANSI)" }, { 50, "" }, { 51, ";" }, - { 52, "'" }, { 53, "`" }, { 54, "," }, { 55, "." }, - { 56, "/" }, { 57, "Caps Lock" }, { 58, "F1" }, { 59, "F2" }, - { 60, "F3" }, { 61, "F4" }, { 62, "F5" }, { 63, "F6" }, - { 64, "F7" }, { 65, "F8" }, { 66, "F9" }, { 67, "F10" }, - { 68, "F11" }, { 69, "F12" }, { 70, "Print Screen" }, { 71, "Scroll Lock" }, - { 72, "Pause/Break" }, { 73, "Insert" }, { 74, "Home" }, { 75, "Page Up" }, - { 76, "Delete" }, { 77, "End" }, { 78, "Page Down" }, { 79, "Right Arrow" }, - { 80, "Left Arrow" }, { 81, "Down Arrow" }, { 82, "Up Arrow" }, { 83, "Num Lock" }, - { 84, "Number Pad /" }, { 85, "Number Pad *" }, { 86, "Number Pad -" }, { 87, "Number Pad +" }, - { 88, "Number Pad Enter" }, { 89, "Number Pad 1" }, { 90, "Number Pad 2" }, { 91, "Number Pad 3" }, - { 92, "Number Pad 4" }, { 93, "Number Pad 5" }, { 94, "Number Pad 6" }, { 95, "Number Pad 7" }, - { 96, "Number Pad 8" }, { 97, "Number Pad 9" }, { 98, "Number Pad 0" }, { 99, "Number Pad ." }, - { 100, "" }, { 101, "Menu" }, { 102, "" }, { 103, "" }, - { 104, "" }, { 105, "" }, { 106, "" }, { 107, "" }, - { 108, "" }, { 109, "" }, { 110, "" }, { 111, "" }, - { 112, "" }, { 113, "" }, { 114, "" }, { 115, "" }, - { 116, "" }, { 117, "" }, { 118, "" }, { 119, "" }, - { 120, "" }, { 121, "" }, { 122, "" }, { 123, "" }, - { 124, "" }, { 125, "" }, { 126, "" }, { 127, "" }, - { 128, "" }, { 129, "" }, { 130, "" }, { 131, "" }, - { 132, "" }, { 133, "" }, { 134, "" }, { 135, "" }, - { 136, "" }, { 137, "" }, { 138, "" }, { 139, "" }, - { 140, "" }, { 141, "" }, { 142, "" }, { 143, "" }, - { 144, "" }, { 145, "" }, { 146, "" }, { 147, "" }, - { 148, "" }, { 149, "" }, { 150, "" }, { 151, "" }, - { 152, "" }, { 153, "" }, { 154, "" }, { 155, "" }, - { 156, "" }, { 157, "" }, { 158, "" }, { 159, "" }, - { 160, "" }, { 161, "" }, { 162, "" }, { 163, "" }, { 164, "" }, - /*Space Cadet Left Shift*/ { 216, "Left Shift"}, /*Space Cadet Right Shift*/ { 217, "Right Shift"}, - { 224, "Left Control" }, { 225, "Left Shift" }, { 226, "Left Alt" }, { 227, "Left Windows" }, - { 228, "Right Control" }, { 229, "Right Shift" }, { 230, "Right Alt" }, { 231, "Right Windows" }, + { 0, KEY_EN_UNUSED }, { 1, KEY_EN_RIGHT_FUNCTION }, { 2, KEY_EN_UNUSED }, { 3, KEY_EN_UNUSED }, + { 4, KEY_EN_A }, { 5, KEY_EN_B }, { 6, KEY_EN_C }, { 7, KEY_EN_D }, + { 8, KEY_EN_E }, { 9, KEY_EN_F }, { 10, KEY_EN_G }, { 11, KEY_EN_H }, + { 12, KEY_EN_I }, { 13, KEY_EN_J }, { 14, KEY_EN_K }, { 15, KEY_EN_L }, + { 16, KEY_EN_M }, { 17, KEY_EN_N }, { 18, KEY_EN_O }, { 19, KEY_EN_P }, + { 20, KEY_EN_Q }, { 21, KEY_EN_R }, { 22, KEY_EN_S }, { 23, KEY_EN_T }, + { 24, KEY_EN_U }, { 25, KEY_EN_V }, { 26, KEY_EN_W }, { 27, KEY_EN_X }, + { 28, KEY_EN_Y }, { 29, KEY_EN_Z }, { 30, KEY_EN_1 }, { 31, KEY_EN_2 }, + { 32, KEY_EN_3 }, { 33, KEY_EN_4 }, { 34, KEY_EN_5 }, { 35, KEY_EN_6 }, + { 36, KEY_EN_7 }, { 37, KEY_EN_8 }, { 38, KEY_EN_9 }, { 39, KEY_EN_0 }, + { 40, KEY_EN_ANSI_ENTER }, { 41, KEY_EN_ESCAPE }, { 42, KEY_EN_BACKSPACE }, { 43, KEY_EN_TAB }, + { 44, KEY_EN_SPACE }, { 45, KEY_EN_MINUS }, { 46, KEY_EN_EQUALS }, { 47, KEY_EN_LEFT_BRACKET }, + { 48, KEY_EN_RIGHT_BRACKET }, { 49, KEY_EN_ANSI_BACK_SLASH }, { 50, KEY_EN_UNUSED }, { 51, KEY_EN_SEMICOLON }, + { 52, KEY_EN_QUOTE }, { 53, KEY_EN_BACK_TICK }, { 54, KEY_EN_COMMA }, { 55, KEY_EN_PERIOD }, + { 56, KEY_EN_FORWARD_SLASH }, { 57, KEY_EN_CAPS_LOCK }, { 58, KEY_EN_F1 }, { 59, KEY_EN_F2 }, + { 60, KEY_EN_F3 }, { 61, KEY_EN_F4 }, { 62, KEY_EN_F5 }, { 63, KEY_EN_F6 }, + { 64, KEY_EN_F7 }, { 65, KEY_EN_F8 }, { 66, KEY_EN_F9 }, { 67, KEY_EN_F10 }, + { 68, KEY_EN_F11 }, { 69, KEY_EN_F12 }, { 70, KEY_EN_PRINT_SCREEN }, { 71, KEY_EN_SCROLL_LOCK }, + { 72, KEY_EN_PAUSE_BREAK }, { 73, KEY_EN_INSERT }, { 74, KEY_EN_HOME }, { 75, KEY_EN_PAGE_UP }, + { 76, KEY_EN_DELETE }, { 77, KEY_EN_END }, { 78, KEY_EN_PAGE_DOWN }, { 79, KEY_EN_RIGHT_ARROW }, + { 80, KEY_EN_LEFT_ARROW }, { 81, KEY_EN_DOWN_ARROW }, { 82, KEY_EN_UP_ARROW }, { 83, KEY_EN_NUMPAD_LOCK }, + { 84, KEY_EN_NUMPAD_DIVIDE }, { 85, KEY_EN_NUMPAD_TIMES }, { 86, KEY_EN_NUMPAD_MINUS }, { 87, KEY_EN_NUMPAD_PLUS }, + { 88, KEY_EN_NUMPAD_ENTER }, { 89, KEY_EN_NUMPAD_1 }, { 90, KEY_EN_NUMPAD_2 }, { 91, KEY_EN_NUMPAD_3 }, + { 92, KEY_EN_NUMPAD_4 }, { 93, KEY_EN_NUMPAD_5 }, { 94, KEY_EN_NUMPAD_6 }, { 95, KEY_EN_NUMPAD_7 }, + { 96, KEY_EN_NUMPAD_8 }, { 97, KEY_EN_NUMPAD_9 }, { 98, KEY_EN_NUMPAD_0 }, { 99, KEY_EN_NUMPAD_PERIOD }, + { 100, KEY_EN_UNUSED }, { 101, KEY_EN_MENU }, { 102, KEY_EN_UNUSED }, { 103, KEY_EN_UNUSED }, + { 104, KEY_EN_UNUSED }, { 105, KEY_EN_UNUSED }, { 106, KEY_EN_UNUSED }, { 107, KEY_EN_UNUSED }, + { 108, KEY_EN_UNUSED }, { 109, KEY_EN_UNUSED }, { 110, KEY_EN_UNUSED }, { 111, KEY_EN_UNUSED }, + { 112, KEY_EN_UNUSED }, { 113, KEY_EN_UNUSED }, { 114, KEY_EN_UNUSED }, { 115, KEY_EN_UNUSED }, + { 116, KEY_EN_UNUSED }, { 117, KEY_EN_UNUSED }, { 118, KEY_EN_UNUSED }, { 119, KEY_EN_UNUSED }, + { 120, KEY_EN_UNUSED }, { 121, KEY_EN_UNUSED }, { 122, KEY_EN_UNUSED }, { 123, KEY_EN_UNUSED }, + { 124, KEY_EN_UNUSED }, { 125, KEY_EN_UNUSED }, { 126, KEY_EN_UNUSED }, { 127, KEY_EN_UNUSED }, + { 128, KEY_EN_UNUSED }, { 129, KEY_EN_UNUSED }, { 130, KEY_EN_UNUSED }, { 131, KEY_EN_UNUSED }, + { 132, KEY_EN_UNUSED }, { 133, KEY_EN_UNUSED }, { 134, KEY_EN_UNUSED }, { 135, KEY_EN_UNUSED }, + { 136, KEY_EN_UNUSED }, { 137, KEY_EN_UNUSED }, { 138, KEY_EN_UNUSED }, { 139, KEY_EN_UNUSED }, + { 140, KEY_EN_UNUSED }, { 141, KEY_EN_UNUSED }, { 142, KEY_EN_UNUSED }, { 143, KEY_EN_UNUSED }, + { 144, KEY_EN_UNUSED }, { 145, KEY_EN_UNUSED }, { 146, KEY_EN_UNUSED }, { 147, KEY_EN_UNUSED }, + { 148, KEY_EN_UNUSED }, { 149, KEY_EN_UNUSED }, { 150, KEY_EN_UNUSED }, { 151, KEY_EN_UNUSED }, + { 152, KEY_EN_UNUSED }, { 153, KEY_EN_UNUSED }, { 154, KEY_EN_UNUSED }, { 155, KEY_EN_UNUSED }, + { 156, KEY_EN_UNUSED }, { 157, KEY_EN_UNUSED }, { 158, KEY_EN_UNUSED }, { 159, KEY_EN_UNUSED }, + { 160, KEY_EN_UNUSED }, { 161, KEY_EN_UNUSED }, { 162, KEY_EN_UNUSED }, { 163, KEY_EN_UNUSED }, + { 164, KEY_EN_UNUSED }, + /*Space Cadet Left Shift*/ { 216, KEY_EN_LEFT_SHIFT }, /*Space Cadet Right Shift*/ { 217, KEY_EN_RIGHT_SHIFT }, + { 224, KEY_EN_LEFT_CONTROL }, { 225, KEY_EN_LEFT_SHIFT }, { 226, KEY_EN_LEFT_ALT }, { 227, KEY_EN_LEFT_WINDOWS }, + { 228, KEY_EN_RIGHT_CONTROL }, { 229, KEY_EN_RIGHT_SHIFT }, { 230, KEY_EN_RIGHT_ALT }, { 231, KEY_EN_RIGHT_WINDOWS }, }; QMKOpenRGBRevDController::QMKOpenRGBRevDController(hid_device *dev_handle, const char *path) @@ -370,11 +372,11 @@ void QMKOpenRGBRevDController::GetLEDInfo(unsigned int leds_count) { if (QMKKeycodeToKeynameMap.count(usb_buf[(led_idx * 7) + QMK_OPENRGB_KEYCODE_BYTE]) > 0) { - led_names.push_back("Key: " + QMKKeycodeToKeynameMap[usb_buf[(led_idx * 7) + QMK_OPENRGB_KEYCODE_BYTE]]); + led_names.push_back(QMKKeycodeToKeynameMap[usb_buf[(led_idx * 7) + QMK_OPENRGB_KEYCODE_BYTE]]); } else { - led_names.push_back("Key: "); + led_names.push_back(KEY_EN_UNUSED); } } else if(usb_buf[(led_idx * 7) + QMK_OPENRGB_FLAG_BYTE] & 2){ diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index d880760e..76bb7f6c 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -2,6 +2,7 @@ #include #include "RGBController.h" +#include "RGBControllerKeyNames.h" /*-----------------------------------------------------*\ | Razer vendor ID | @@ -228,116 +229,116 @@ static const razer_key blackwidow_chroma_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, { 0, 1, 0, "Key: M1" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, { 0, 2, 0, "Key: M2" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, { 0, 3, 0, "Key: M3" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, { 0, 4, 0, "Key: M4" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, { 0, 5, 0, "Key: M5" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define BLACKWIDOW_CHROMA_TE_KEYMAP_SIZE (sizeof(blackwidow_chroma_te_keymap) / sizeof(blackwidow_chroma_te_keymap[0])) @@ -347,94 +348,94 @@ static const razer_key blackwidow_chroma_te_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, }; #define BLACKWIDOW_V3_TKL_KEYMAP_SIZE (sizeof(blackwidow_v3_tkl_keymap) / sizeof(blackwidow_v3_tkl_keymap[0])) @@ -444,93 +445,93 @@ static const razer_key blackwidow_v3_tkl_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, }; #define BLACKWIDOW_V3_MINI_KEYMAP_SIZE (sizeof(blackwidow_v3_mini_keymap) / sizeof(blackwidow_v3_mini_keymap[0])) @@ -540,77 +541,77 @@ static const razer_key blackwidow_v3_mini_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 0, "Key: Escape" }, - { 0, 0, 1, "Key: 1" }, - { 0, 0, 2, "Key: 2" }, - { 0, 0, 3, "Key: 3" }, - { 0, 0, 4, "Key: 4" }, - { 0, 0, 5, "Key: 5" }, - { 0, 0, 6, "Key: 6" }, - { 0, 0, 7, "Key: 7" }, - { 0, 0, 8, "Key: 8" }, - { 0, 0, 9, "Key: 9" }, - { 0, 0, 10, "Key: 0" }, - { 0, 0, 11, "Key: -" }, - { 0, 0, 12, "Key: =" }, - { 0, 0, 14, "Key: Backspace" }, - { 0, 0, 15, "Key: Delete" }, - { 0, 1, 0, "Key: Tab" }, - { 0, 1, 1, "Key: Q" }, - { 0, 1, 2, "Key: W" }, - { 0, 1, 3, "Key: E" }, - { 0, 1, 4, "Key: R" }, - { 0, 1, 5, "Key: T" }, - { 0, 1, 6, "Key: Y" }, - { 0, 1, 7, "Key: U" }, - { 0, 1, 8, "Key: I" }, - { 0, 1, 9, "Key: O" }, - { 0, 1, 10, "Key: P" }, - { 0, 1, 11, "Key: [" }, - { 0, 1, 12, "Key: ]" }, - { 0, 1, 13, "Key: \\ (ANSI)" }, - { 0, 1, 15, "Key: Page Up" }, - { 0, 2, 0, "Key: Caps Lock" }, - { 0, 2, 1, "Key: A" }, - { 0, 2, 2, "Key: S" }, - { 0, 2, 3, "Key: D" }, - { 0, 2, 4, "Key: F" }, - { 0, 2, 5, "Key: G" }, - { 0, 2, 6, "Key: H" }, - { 0, 2, 7, "Key: J" }, - { 0, 2, 8, "Key: K" }, - { 0, 2, 9, "Key: L" }, - { 0, 2, 10, "Key: ;" }, - { 0, 2, 11, "Key: '" }, - { 0, 2, 12, "Key: #" }, - { 0, 2, 13, "Key: Enter" }, - { 0, 2, 15, "Key: Page Down" }, - { 0, 3, 0, "Key: Left Shift" }, - { 0, 3, 1, "Key: \\ (ISO)" }, - { 0, 3, 2, "Key: Z" }, - { 0, 3, 3, "Key: X" }, - { 0, 3, 4, "Key: C" }, - { 0, 3, 5, "Key: V" }, - { 0, 3, 6, "Key: B" }, - { 0, 3, 7, "Key: N" }, - { 0, 3, 8, "Key: M" }, - { 0, 3, 9, "Key: ," }, - { 0, 3, 10, "Key: ." }, - { 0, 3, 11, "Key: /" }, - { 0, 3, 13, "Key: Right Shift" }, - { 0, 3, 14, "Key: Up Arrow" }, - { 0, 3, 15, "Key: Insert" }, - { 0, 4, 0, "Key: Left Control" }, - { 0, 4, 1, "Key: Left Windows" }, - { 0, 4, 2, "Key: Left Alt" }, - { 0, 4, 6, "Key: Space" }, + { 0, 0, 0, KEY_EN_ESCAPE }, + { 0, 0, 1, KEY_EN_1 }, + { 0, 0, 2, KEY_EN_2 }, + { 0, 0, 3, KEY_EN_3 }, + { 0, 0, 4, KEY_EN_4 }, + { 0, 0, 5, KEY_EN_5 }, + { 0, 0, 6, KEY_EN_6 }, + { 0, 0, 7, KEY_EN_7 }, + { 0, 0, 8, KEY_EN_8 }, + { 0, 0, 9, KEY_EN_9 }, + { 0, 0, 10, KEY_EN_0 }, + { 0, 0, 11, KEY_EN_MINUS }, + { 0, 0, 12, KEY_EN_EQUALS }, + { 0, 0, 14, KEY_EN_BACKSPACE }, + { 0, 0, 15, KEY_EN_DELETE }, + { 0, 1, 0, KEY_EN_TAB }, + { 0, 1, 1, KEY_EN_Q }, + { 0, 1, 2, KEY_EN_W }, + { 0, 1, 3, KEY_EN_E }, + { 0, 1, 4, KEY_EN_R }, + { 0, 1, 5, KEY_EN_T }, + { 0, 1, 6, KEY_EN_Y }, + { 0, 1, 7, KEY_EN_U }, + { 0, 1, 8, KEY_EN_I }, + { 0, 1, 9, KEY_EN_O }, + { 0, 1, 10, KEY_EN_P }, + { 0, 1, 11, KEY_EN_LEFT_BRACKET }, + { 0, 1, 12, KEY_EN_RIGHT_BRACKET }, + { 0, 1, 13, KEY_EN_ANSI_BACK_SLASH }, + { 0, 1, 15, KEY_EN_PAGE_UP }, + { 0, 2, 0, KEY_EN_CAPS_LOCK }, + { 0, 2, 1, KEY_EN_A }, + { 0, 2, 2, KEY_EN_S }, + { 0, 2, 3, KEY_EN_D }, + { 0, 2, 4, KEY_EN_F }, + { 0, 2, 5, KEY_EN_G }, + { 0, 2, 6, KEY_EN_H }, + { 0, 2, 7, KEY_EN_J }, + { 0, 2, 8, KEY_EN_K }, + { 0, 2, 9, KEY_EN_L }, + { 0, 2, 10, KEY_EN_SEMICOLON }, + { 0, 2, 11, KEY_EN_QUOTE }, + { 0, 2, 12, KEY_EN_POUND }, + { 0, 2, 13, KEY_EN_ANSI_ENTER }, + { 0, 2, 15, KEY_EN_PAGE_DOWN }, + { 0, 3, 0, KEY_EN_LEFT_SHIFT }, + { 0, 3, 1, KEY_EN_ISO_BACK_SLASH }, + { 0, 3, 2, KEY_EN_Z }, + { 0, 3, 3, KEY_EN_X }, + { 0, 3, 4, KEY_EN_C }, + { 0, 3, 5, KEY_EN_V }, + { 0, 3, 6, KEY_EN_B }, + { 0, 3, 7, KEY_EN_N }, + { 0, 3, 8, KEY_EN_M }, + { 0, 3, 9, KEY_EN_COMMA }, + { 0, 3, 10, KEY_EN_PERIOD }, + { 0, 3, 11, KEY_EN_FORWARD_SLASH }, + { 0, 3, 13, KEY_EN_RIGHT_SHIFT }, + { 0, 3, 14, KEY_EN_UP_ARROW }, + { 0, 3, 15, KEY_EN_INSERT }, + { 0, 4, 0, KEY_EN_LEFT_CONTROL }, + { 0, 4, 1, KEY_EN_LEFT_WINDOWS }, + { 0, 4, 2, KEY_EN_LEFT_ALT }, + { 0, 4, 6, KEY_EN_SPACE }, { 0, 4, 7, "Logo" }, - { 0, 4, 10, "Key: Right Alt" }, - { 0, 4, 11, "Key: Right Fn" }, - { 0, 4, 12, "Key: Right Control" }, - { 0, 4, 13, "Key: Left Arrow" }, - { 0, 4, 14, "Key: Down Arrow" }, - { 0, 4, 15, "Key: Right Arrow" }, + { 0, 4, 10, KEY_EN_RIGHT_ALT }, + { 0, 4, 11, KEY_EN_RIGHT_FUNCTION }, + { 0, 4, 12, KEY_EN_RIGHT_CONTROL }, + { 0, 4, 13, KEY_EN_LEFT_ARROW }, + { 0, 4, 14, KEY_EN_DOWN_ARROW }, + { 0, 4, 15, KEY_EN_RIGHT_ARROW }, }; #define BOOK_13_2020_KEYMAP_SIZE (sizeof(book_13_2020_keymap) / sizeof(book_13_2020_keymap[0])) @@ -620,84 +621,84 @@ static const razer_key book_13_2020_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 2, "Key: F1" }, - { 0, 0, 3, "Key: F2" }, - { 0, 0, 4, "Key: F3" }, - { 0, 0, 5, "Key: F4" }, - { 0, 0, 6, "Key: F5" }, - { 0, 0, 7, "Key: F6" }, - { 0, 0, 8, "Key: F7" }, - { 0, 0, 9, "Key: F8" }, - { 0, 0, 10, "Key: F9" }, - { 0, 0, 11, "Key: F10" }, - { 0, 0, 12, "Key: F11" }, - { 0, 0, 13, "Key: F12" }, - { 0, 0, 14, "Key: Delete" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_F1 }, + { 0, 0, 3, KEY_EN_F2 }, + { 0, 0, 4, KEY_EN_F3 }, + { 0, 0, 5, KEY_EN_F4 }, + { 0, 0, 6, KEY_EN_F5 }, + { 0, 0, 7, KEY_EN_F6 }, + { 0, 0, 8, KEY_EN_F7 }, + { 0, 0, 9, KEY_EN_F8 }, + { 0, 0, 10, KEY_EN_F9 }, + { 0, 0, 11, KEY_EN_F10 }, + { 0, 0, 12, KEY_EN_F11 }, + { 0, 0, 13, KEY_EN_F12 }, + { 0, 0, 14, KEY_EN_DELETE }, { 0, 0, 15, "Key: Power" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 15, "Key: \\ (ANSI)" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 15, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 15, "Key: Right Shift" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Fn" }, - { 0, 5, 3, "Key: Left Windows" }, - { 0, 5, 5, "Key: Left Alt" }, - { 0, 5, 9, "Key: Right Alt" }, - { 0, 5, 11, "Key: Right Control" }, - { 0, 5, 12, "Key: Left Arrow" }, - { 0, 5, 13, "Key: Up Arrow" }, - { 0, 5, 14, "Key: Right Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 15, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 15, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 15, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 3, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 5, KEY_EN_LEFT_ALT }, + { 0, 5, 9, KEY_EN_RIGHT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 12, KEY_EN_LEFT_ARROW }, + { 0, 5, 13, KEY_EN_UP_ARROW }, + { 0, 5, 14, KEY_EN_RIGHT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, }; #define BLADE_14_2021_KEYMAP_SIZE (sizeof(blade_14_2021_keymap) / sizeof(blade_14_2021_keymap[0])) @@ -707,84 +708,84 @@ static const razer_key blade_14_2021_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 2, "Key: F1" }, - { 0, 0, 3, "Key: F2" }, - { 0, 0, 4, "Key: F3" }, - { 0, 0, 5, "Key: F4" }, - { 0, 0, 6, "Key: F5" }, - { 0, 0, 7, "Key: F6" }, - { 0, 0, 8, "Key: F7" }, - { 0, 0, 9, "Key: F8" }, - { 0, 0, 10, "Key: F9" }, - { 0, 0, 11, "Key: F10" }, - { 0, 0, 12, "Key: F11" }, - { 0, 0, 13, "Key: F12" }, - { 0, 0, 14, "Key: Delete" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_F1 }, + { 0, 0, 3, KEY_EN_F2 }, + { 0, 0, 4, KEY_EN_F3 }, + { 0, 0, 5, KEY_EN_F4 }, + { 0, 0, 6, KEY_EN_F5 }, + { 0, 0, 7, KEY_EN_F6 }, + { 0, 0, 8, KEY_EN_F7 }, + { 0, 0, 9, KEY_EN_F8 }, + { 0, 0, 10, KEY_EN_F9 }, + { 0, 0, 11, KEY_EN_F10 }, + { 0, 0, 12, KEY_EN_F11 }, + { 0, 0, 13, KEY_EN_F12 }, + { 0, 0, 14, KEY_EN_DELETE }, { 0, 0, 15, "Key: Power" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 15, "Key: \\ (ANSI)" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 15, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 15, "Key: Right Shift" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Fn" }, - { 0, 5, 3, "Key: Left Windows" }, - { 0, 5, 5, "Key: Left Alt" }, - { 0, 5, 9, "Key: Right Alt" }, - { 0, 5, 11, "Key: Right Control" }, - { 0, 5, 12, "Key: Left Arrow" }, - { 0, 5, 13, "Key: Up Arrow" }, - { 0, 5, 14, "Key: Right Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 15, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 15, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 15, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 3, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 5, KEY_EN_LEFT_ALT }, + { 0, 5, 9, KEY_EN_RIGHT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 12, KEY_EN_LEFT_ARROW }, + { 0, 5, 13, KEY_EN_UP_ARROW }, + { 0, 5, 14, KEY_EN_RIGHT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, }; #define BLADE_17_PRO_2021_KEYMAP_SIZE (sizeof(blade_17_pro_2021_keymap) / sizeof(blade_17_pro_2021_keymap[0])) @@ -794,87 +795,87 @@ static const razer_key blade_17_pro_2021_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 2, "Key: F1" }, - { 0, 0, 3, "Key: F2" }, - { 0, 0, 4, "Key: F3" }, - { 0, 0, 5, "Key: F4" }, - { 0, 0, 6, "Key: F5" }, - { 0, 0, 7, "Key: F6" }, - { 0, 0, 8, "Key: F7" }, - { 0, 0, 9, "Key: F8" }, - { 0, 0, 10, "Key: F9" }, - { 0, 0, 11, "Key: F10" }, - { 0, 0, 12, "Key: F11" }, - { 0, 0, 13, "Key: F12" }, - { 0, 0, 14, "Key: Insert" }, - { 0, 0, 15, "Key: Delete" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: Enter" }, - { 0, 2, 15, "Key: \\ (ANSI)" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 15, "Key: Right Shift" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Fn" }, - { 0, 5, 3, "Key: Left Windows" }, - { 0, 5, 5, "Key: Left Alt" }, - { 0, 5, 9, "Key: Right Alt" }, - { 0, 5, 10, "Key: Right Fn" }, - { 0, 5, 11, "Key: Right Control" }, - { 0, 5, 12, "Key: Left Arrow" }, - { 0, 5, 13, "Key: Up Arrow" }, - { 0, 5, 14, "Key: Right Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_F1 }, + { 0, 0, 3, KEY_EN_F2 }, + { 0, 0, 4, KEY_EN_F3 }, + { 0, 0, 5, KEY_EN_F4 }, + { 0, 0, 6, KEY_EN_F5 }, + { 0, 0, 7, KEY_EN_F6 }, + { 0, 0, 8, KEY_EN_F7 }, + { 0, 0, 9, KEY_EN_F8 }, + { 0, 0, 10, KEY_EN_F9 }, + { 0, 0, 11, KEY_EN_F10 }, + { 0, 0, 12, KEY_EN_F11 }, + { 0, 0, 13, KEY_EN_F12 }, + { 0, 0, 14, KEY_EN_INSERT }, + { 0, 0, 15, KEY_EN_DELETE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_ENTER }, + { 0, 2, 15, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 15, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 3, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 5, KEY_EN_LEFT_ALT }, + { 0, 5, 9, KEY_EN_RIGHT_ALT }, + { 0, 5, 10, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 11, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 12, KEY_EN_LEFT_ARROW }, + { 0, 5, 13, KEY_EN_UP_ARROW }, + { 0, 5, 14, KEY_EN_RIGHT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, }; #define BLADE_PRO_2017_KEYMAP_SIZE (sizeof(blade_pro_2017_keymap) / sizeof(blade_pro_2017_keymap[0])) @@ -884,91 +885,91 @@ static const razer_key blade_pro_2017_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 2, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Insert" }, - { 0, 0, 17, "Key: Delete" }, - { 0, 0, 19, "Key: Media Previous" }, - { 0, 0, 20, "Key: Media Next" }, + { 0, 0, 2, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_INSERT }, + { 0, 0, 17, KEY_EN_DELETE }, + { 0, 0, 19, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, { 0, 0, 21, "Key: Media Volume" }, - { 0, 0, 23, "Key: Media Play/Pause" }, - { 0, 0, 24, "Key: Media Mute" }, - { 0, 1, 2, "Key: `" }, - { 0, 1, 3, "Key: 1" }, - { 0, 1, 4, "Key: 2" }, - { 0, 1, 5, "Key: 3" }, - { 0, 1, 6, "Key: 4" }, - { 0, 1, 7, "Key: 5" }, - { 0, 1, 8, "Key: 6" }, - { 0, 1, 9, "Key: 7" }, - { 0, 1, 10, "Key: 8" }, - { 0, 1, 11, "Key: 9" }, - { 0, 1, 12, "Key: 0" }, - { 0, 1, 13, "Key: -" }, - { 0, 1, 14, "Key: =" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 2, "Key: Tab" }, - { 0, 2, 4, "Key: Q" }, - { 0, 2, 5, "Key: W" }, - { 0, 2, 6, "Key: E" }, - { 0, 2, 7, "Key: R" }, - { 0, 2, 8, "Key: T" }, - { 0, 2, 9, "Key: Y" }, - { 0, 2, 10, "Key: U" }, - { 0, 2, 11, "Key: I" }, - { 0, 2, 12, "Key: O" }, - { 0, 2, 13, "Key: P" }, - { 0, 2, 14, "Key: [" }, - { 0, 2, 15, "Key: ]" }, - { 0, 2, 17, "Key: \\ (ANSI)" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 4, "Key: A" }, - { 0, 3, 5, "Key: S" }, - { 0, 3, 6, "Key: D" }, - { 0, 3, 7, "Key: F" }, - { 0, 3, 8, "Key: G" }, - { 0, 3, 9, "Key: H" }, - { 0, 3, 10, "Key: J" }, - { 0, 3, 11, "Key: K" }, - { 0, 3, 12, "Key: L" }, - { 0, 3, 13, "Key: ;" }, - { 0, 3, 14, "Key: '" }, - { 0, 3, 18, "Key: Enter" }, - { 0, 4, 0, "Key: Left Shift" }, - { 0, 4, 4, "Key: Z" }, - { 0, 4, 5, "Key: X" }, - { 0, 4, 6, "Key: C" }, - { 0, 4, 7, "Key: V" }, - { 0, 4, 8, "Key: B" }, - { 0, 4, 9, "Key: N" }, - { 0, 4, 10, "Key: M" }, - { 0, 4, 11, "Key: ," }, - { 0, 4, 12, "Key: ." }, - { 0, 4, 13, "Key: /" }, - { 0, 4, 14, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Right Shift" }, - { 0, 5, 0, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Fn" }, - { 0, 5, 3, "Key: Left Windows" }, - { 0, 5, 5, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Control" }, - { 0, 5, 13, "Key: Left Arrow" }, - { 0, 5, 14, "Key: Down Arrow" }, - { 0, 5, 15, "Key: Right Arrow" }, - { 0, 5, 16, "Key: Right Fn" }, + { 0, 0, 23, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 24, KEY_EN_MEDIA_MUTE }, + { 0, 1, 2, KEY_EN_BACK_TICK }, + { 0, 1, 3, KEY_EN_1 }, + { 0, 1, 4, KEY_EN_2 }, + { 0, 1, 5, KEY_EN_3 }, + { 0, 1, 6, KEY_EN_4 }, + { 0, 1, 7, KEY_EN_5 }, + { 0, 1, 8, KEY_EN_6 }, + { 0, 1, 9, KEY_EN_7 }, + { 0, 1, 10, KEY_EN_8 }, + { 0, 1, 11, KEY_EN_9 }, + { 0, 1, 12, KEY_EN_0 }, + { 0, 1, 13, KEY_EN_MINUS }, + { 0, 1, 14, KEY_EN_EQUALS }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 2, KEY_EN_TAB }, + { 0, 2, 4, KEY_EN_Q }, + { 0, 2, 5, KEY_EN_W }, + { 0, 2, 6, KEY_EN_E }, + { 0, 2, 7, KEY_EN_R }, + { 0, 2, 8, KEY_EN_T }, + { 0, 2, 9, KEY_EN_Y }, + { 0, 2, 10, KEY_EN_U }, + { 0, 2, 11, KEY_EN_I }, + { 0, 2, 12, KEY_EN_O }, + { 0, 2, 13, KEY_EN_P }, + { 0, 2, 14, KEY_EN_LEFT_BRACKET }, + { 0, 2, 15, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 17, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 4, KEY_EN_A }, + { 0, 3, 5, KEY_EN_S }, + { 0, 3, 6, KEY_EN_D }, + { 0, 3, 7, KEY_EN_F }, + { 0, 3, 8, KEY_EN_G }, + { 0, 3, 9, KEY_EN_H }, + { 0, 3, 10, KEY_EN_J }, + { 0, 3, 11, KEY_EN_K }, + { 0, 3, 12, KEY_EN_L }, + { 0, 3, 13, KEY_EN_SEMICOLON }, + { 0, 3, 14, KEY_EN_QUOTE }, + { 0, 3, 18, KEY_EN_ANSI_ENTER }, + { 0, 4, 0, KEY_EN_LEFT_SHIFT }, + { 0, 4, 4, KEY_EN_Z }, + { 0, 4, 5, KEY_EN_X }, + { 0, 4, 6, KEY_EN_C }, + { 0, 4, 7, KEY_EN_V }, + { 0, 4, 8, KEY_EN_B }, + { 0, 4, 9, KEY_EN_N }, + { 0, 4, 10, KEY_EN_M }, + { 0, 4, 11, KEY_EN_COMMA }, + { 0, 4, 12, KEY_EN_PERIOD }, + { 0, 4, 13, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 0, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 3, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 5, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 13, KEY_EN_LEFT_ARROW }, + { 0, 5, 14, KEY_EN_DOWN_ARROW }, + { 0, 5, 15, KEY_EN_RIGHT_ARROW }, + { 0, 5, 16, KEY_EN_RIGHT_FUNCTION }, }; #define BLADE_STEALTH_2016_KEYMAP_SIZE (sizeof(blade_stealth_2016_keymap) / sizeof(blade_stealth_2016_keymap[0])) @@ -978,93 +979,93 @@ static const razer_key blade_stealth_2016_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 2, "Key: F1" }, - { 0, 0, 3, "Key: F2" }, - { 0, 0, 4, "Key: F3" }, - { 0, 0, 5, "Key: F4" }, - { 0, 0, 6, "Key: F5" }, - { 0, 0, 7, "Key: F6" }, - { 0, 0, 8, "Key: F7" }, - { 0, 0, 9, "Key: F8" }, - { 0, 0, 10, "Key: F9" }, - { 0, 0, 11, "Key: F10" }, - { 0, 0, 12, "Key: F11" }, - { 0, 0, 13, "Key: F12" }, - { 0, 0, 14, "Key: Insert" }, - { 0, 0, 15, "Key: Delete" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Backspace" }, - { 0, 2, 0, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: \\ (ANSI)" }, - { 0, 3, 0, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 15, "Key: Enter" }, - { 0, 4, 0, "Key: Left Shift" }, - { 0, 4, 2, "Key: Z" }, - { 0, 4, 3, "Key: X" }, - { 0, 4, 4, "Key: C" }, - { 0, 4, 5, "Key: V" }, - { 0, 4, 6, "Key: B" }, - { 0, 4, 7, "Key: N" }, - { 0, 4, 8, "Key: M" }, - { 0, 4, 9, "Key: ," }, - { 0, 4, 10, "Key: ." }, - { 0, 4, 11, "Key: /" }, - { 0, 4, 12, "Key: Right Shift" }, - { 0, 4, 13, "Key: Right Shift" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 5, 0, "Key: Left Control" }, - { 0, 5, 1, "Key: Left Fn" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 5, "Key: Space" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 8, "Key: Space" }, - { 0, 5, 9, "Key: Right Alt" }, - { 0, 5, 10, "Key: Right Fn" }, - { 0, 5, 11, "Key: Right Control" }, - { 0, 5, 12, "Key: Left Arrow" }, - { 0, 5, 13, "Key: Up Arrow" }, - { 0, 5, 14, "Key: Right Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_F1 }, + { 0, 0, 3, KEY_EN_F2 }, + { 0, 0, 4, KEY_EN_F3 }, + { 0, 0, 5, KEY_EN_F4 }, + { 0, 0, 6, KEY_EN_F5 }, + { 0, 0, 7, KEY_EN_F6 }, + { 0, 0, 8, KEY_EN_F7 }, + { 0, 0, 9, KEY_EN_F8 }, + { 0, 0, 10, KEY_EN_F9 }, + { 0, 0, 11, KEY_EN_F10 }, + { 0, 0, 12, KEY_EN_F11 }, + { 0, 0, 13, KEY_EN_F12 }, + { 0, 0, 14, KEY_EN_INSERT }, + { 0, 0, 15, KEY_EN_DELETE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_BACKSPACE }, + { 0, 2, 0, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_ANSI_BACK_SLASH }, + { 0, 3, 0, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 15, KEY_EN_ANSI_ENTER }, + { 0, 4, 0, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_Z }, + { 0, 4, 3, KEY_EN_X }, + { 0, 4, 4, KEY_EN_C }, + { 0, 4, 5, KEY_EN_V }, + { 0, 4, 6, KEY_EN_B }, + { 0, 4, 7, KEY_EN_N }, + { 0, 4, 8, KEY_EN_M }, + { 0, 4, 9, KEY_EN_COMMA }, + { 0, 4, 10, KEY_EN_PERIOD }, + { 0, 4, 11, KEY_EN_FORWARD_SLASH }, + { 0, 4, 12, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 13, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 5, 0, KEY_EN_LEFT_CONTROL }, + { 0, 5, 1, KEY_EN_LEFT_FUNCTION }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 5, KEY_EN_SPACE }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 8, KEY_EN_SPACE }, + { 0, 5, 9, KEY_EN_RIGHT_ALT }, + { 0, 5, 10, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 11, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 12, KEY_EN_LEFT_ARROW }, + { 0, 5, 13, KEY_EN_UP_ARROW }, + { 0, 5, 14, KEY_EN_RIGHT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, }; #define CYNOSA_CHROMA_KEYMAP_SIZE (sizeof(cynosa_chroma_keymap) / sizeof(cynosa_chroma_keymap[0])) @@ -1074,113 +1075,113 @@ static const razer_key cynosa_chroma_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define CYNOSA_CHROMA_V2_KEYMAP_SIZE (sizeof(cynosa_chroma_v2_keymap) / sizeof(cynosa_chroma_v2_keymap[0])) @@ -1190,113 +1191,113 @@ static const razer_key cynosa_chroma_v2_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_ELITE_KEYMAP_SIZE (sizeof(huntsman_elite_keymap) / sizeof(huntsman_elite_keymap[0])) @@ -1306,116 +1307,116 @@ static const razer_key huntsman_elite_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 0, 18, "Key: Media Previous" }, - { 0, 0, 19, "Key: Media Play/Pause" }, - { 0, 0, 20, "Key: Media Next" }, - { 0, 0, 21, "Key: Media Mute" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 0, 18, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 19, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, + { 0, 0, 21, KEY_EN_MEDIA_MUTE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_V2_ANALOG_KEYMAP_SIZE (sizeof(huntsman_v2_analog_keymap) / sizeof(huntsman_v2_analog_keymap[0])) @@ -1425,116 +1426,116 @@ static const razer_key huntsman_v2_analog_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 0, 18, "Key: Media Previous" }, - { 0, 0, 19, "Key: Media Play/Pause" }, - { 0, 0, 20, "Key: Media Next" }, - { 0, 0, 21, "Key: Media Mute" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 0, 18, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 19, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, + { 0, 0, 21, KEY_EN_MEDIA_MUTE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_KEYMAP_SIZE (sizeof(huntsman_keymap) / sizeof(huntsman_keymap[0])) @@ -1544,112 +1545,112 @@ static const razer_key huntsman_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_MINI_KEYMAP_SIZE (sizeof(huntsman_mini_keymap) / sizeof(huntsman_mini_keymap[0])) @@ -1659,69 +1660,69 @@ static const razer_key huntsman_mini_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 2, "Key: 1" }, - { 0, 0, 3, "Key: 2" }, - { 0, 0, 4, "Key: 3" }, - { 0, 0, 5, "Key: 4" }, - { 0, 0, 6, "Key: 5" }, - { 0, 0, 7, "Key: 6" }, - { 0, 0, 8, "Key: 7" }, - { 0, 0, 9, "Key: 8" }, - { 0, 0, 10, "Key: 9" }, - { 0, 0, 11, "Key: 0" }, - { 0, 0, 12, "Key: -" }, - { 0, 0, 13, "Key: =" }, - { 0, 0, 14, "Key: Backspace" }, - { 0, 1, 1, "Key: Tab" }, - { 0, 1, 2, "Key: Q" }, - { 0, 1, 3, "Key: W" }, - { 0, 1, 4, "Key: E" }, - { 0, 1, 5, "Key: R" }, - { 0, 1, 6, "Key: T" }, - { 0, 1, 7, "Key: Y" }, - { 0, 1, 8, "Key: U" }, - { 0, 1, 9, "Key: I" }, - { 0, 1, 10, "Key: O" }, - { 0, 1, 11, "Key: P" }, - { 0, 1, 12, "Key: [" }, - { 0, 1, 13, "Key: ]" }, - { 0, 1, 14, "Key: \\ (ANSI)" }, - { 0, 2, 1, "Key: Caps Lock" }, - { 0, 2, 2, "Key: A" }, - { 0, 2, 3, "Key: S" }, - { 0, 2, 4, "Key: D" }, - { 0, 2, 5, "Key: F" }, - { 0, 2, 6, "Key: G" }, - { 0, 2, 7, "Key: H" }, - { 0, 2, 8, "Key: J" }, - { 0, 2, 9, "Key: K" }, - { 0, 2, 10, "Key: L" }, - { 0, 2, 11, "Key: ;" }, - { 0, 2, 12, "Key: '" }, - { 0, 2, 13, "Key: #" }, - { 0, 2, 14, "Key: Enter" }, - { 0, 3, 1, "Key: Left Shift" }, - { 0, 3, 2, "Key: \\ (ISO)" }, - { 0, 3, 3, "Key: Z" }, - { 0, 3, 4, "Key: X" }, - { 0, 3, 5, "Key: C" }, - { 0, 3, 6, "Key: V" }, - { 0, 3, 7, "Key: B" }, - { 0, 3, 8, "Key: N" }, - { 0, 3, 9, "Key: M" }, - { 0, 3, 10, "Key: ," }, - { 0, 3, 11, "Key: ." }, - { 0, 3, 12, "Key: /" }, - { 0, 3, 14, "Key: Right Shift" }, - { 0, 4, 1, "Key: Left Control" }, - { 0, 4, 2, "Key: Left Windows" }, - { 0, 4, 3, "Key: Left Alt" }, - { 0, 4, 7, "Key: Space" }, - { 0, 4, 11, "Key: Right Alt" }, - { 0, 4, 12, "Key: Right Fn" }, - { 0, 4, 13, "Key: Menu" }, - { 0, 4, 14, "Key: Right Control" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_1 }, + { 0, 0, 3, KEY_EN_2 }, + { 0, 0, 4, KEY_EN_3 }, + { 0, 0, 5, KEY_EN_4 }, + { 0, 0, 6, KEY_EN_5 }, + { 0, 0, 7, KEY_EN_6 }, + { 0, 0, 8, KEY_EN_7 }, + { 0, 0, 9, KEY_EN_8 }, + { 0, 0, 10, KEY_EN_9 }, + { 0, 0, 11, KEY_EN_0 }, + { 0, 0, 12, KEY_EN_MINUS }, + { 0, 0, 13, KEY_EN_EQUALS }, + { 0, 0, 14, KEY_EN_BACKSPACE }, + { 0, 1, 1, KEY_EN_TAB }, + { 0, 1, 2, KEY_EN_Q }, + { 0, 1, 3, KEY_EN_W }, + { 0, 1, 4, KEY_EN_E }, + { 0, 1, 5, KEY_EN_R }, + { 0, 1, 6, KEY_EN_T }, + { 0, 1, 7, KEY_EN_Y }, + { 0, 1, 8, KEY_EN_U }, + { 0, 1, 9, KEY_EN_I }, + { 0, 1, 10, KEY_EN_O }, + { 0, 1, 11, KEY_EN_P }, + { 0, 1, 12, KEY_EN_LEFT_BRACKET }, + { 0, 1, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 1, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 1, KEY_EN_CAPS_LOCK }, + { 0, 2, 2, KEY_EN_A }, + { 0, 2, 3, KEY_EN_S }, + { 0, 2, 4, KEY_EN_D }, + { 0, 2, 5, KEY_EN_F }, + { 0, 2, 6, KEY_EN_G }, + { 0, 2, 7, KEY_EN_H }, + { 0, 2, 8, KEY_EN_J }, + { 0, 2, 9, KEY_EN_K }, + { 0, 2, 10, KEY_EN_L }, + { 0, 2, 11, KEY_EN_SEMICOLON }, + { 0, 2, 12, KEY_EN_QUOTE }, + { 0, 2, 13, KEY_EN_POUND }, + { 0, 2, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 1, KEY_EN_LEFT_SHIFT }, + { 0, 3, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 3, 3, KEY_EN_Z }, + { 0, 3, 4, KEY_EN_X }, + { 0, 3, 5, KEY_EN_C }, + { 0, 3, 6, KEY_EN_V }, + { 0, 3, 7, KEY_EN_B }, + { 0, 3, 8, KEY_EN_N }, + { 0, 3, 9, KEY_EN_M }, + { 0, 3, 10, KEY_EN_COMMA }, + { 0, 3, 11, KEY_EN_PERIOD }, + { 0, 3, 12, KEY_EN_FORWARD_SLASH }, + { 0, 3, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 1, KEY_EN_LEFT_CONTROL }, + { 0, 4, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 4, 3, KEY_EN_LEFT_ALT }, + { 0, 4, 7, KEY_EN_SPACE }, + { 0, 4, 11, KEY_EN_RIGHT_ALT }, + { 0, 4, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 4, 13, KEY_EN_MENU }, + { 0, 4, 14, KEY_EN_RIGHT_CONTROL }, }; #define HUNTSMAN_TE_KEYMAP_SIZE (sizeof(huntsman_te_keymap) / sizeof(huntsman_te_keymap[0])) @@ -1731,95 +1732,95 @@ static const razer_key huntsman_te_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, }; #define HUNTSMAN_V2_KEYMAP_SIZE (sizeof(huntsman_v2_keymap) / sizeof(huntsman_v2_keymap[0])) @@ -1829,116 +1830,116 @@ static const razer_key huntsman_v2_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 0, "Key: Escape" }, - { 0, 0, 2, "Key: F1" }, - { 0, 0, 3, "Key: F2" }, - { 0, 0, 4, "Key: F3" }, - { 0, 0, 5, "Key: F4" }, - { 0, 0, 6, "Key: F5" }, - { 0, 0, 7, "Key: F6" }, - { 0, 0, 8, "Key: F7" }, - { 0, 0, 9, "Key: F8" }, - { 0, 0, 10, "Key: F9" }, - { 0, 0, 11, "Key: F10" }, - { 0, 0, 12, "Key: F11" }, - { 0, 0, 13, "Key: F12" }, - { 0, 0, 14, "Key: Print Screen" }, - { 0, 0, 15, "Key: Scroll Lock" }, - { 0, 0, 16, "Key: Pause/Break" }, - { 0, 0, 17, "Key: Media Previous" }, - { 0, 0, 18, "Key: Media Play/Pause" }, - { 0, 0, 19, "Key: Media Next" }, - { 0, 0, 20, "Key: Media Mute" }, - { 0, 1, 0, "Key: `" }, - { 0, 1, 1, "Key: 1" }, - { 0, 1, 2, "Key: 2" }, - { 0, 1, 3, "Key: 3" }, - { 0, 1, 4, "Key: 4" }, - { 0, 1, 5, "Key: 5" }, - { 0, 1, 6, "Key: 6" }, - { 0, 1, 7, "Key: 7" }, - { 0, 1, 8, "Key: 8" }, - { 0, 1, 9, "Key: 9" }, - { 0, 1, 10, "Key: 0" }, - { 0, 1, 11, "Key: -" }, - { 0, 1, 12, "Key: =" }, - { 0, 1, 13, "Key: Backspace" }, - { 0, 1, 14, "Key: Insert" }, - { 0, 1, 15, "Key: Home" }, - { 0, 1, 16, "Key: Page Up" }, - { 0, 1, 17, "Key: Num Lock" }, - { 0, 1, 18, "Key: Number Pad /" }, - { 0, 1, 19, "Key: Number Pad *" }, - { 0, 1, 20, "Key: Number Pad -" }, - { 0, 2, 0, "Key: Tab" }, - { 0, 2, 1, "Key: Q" }, - { 0, 2, 2, "Key: W" }, - { 0, 2, 3, "Key: E" }, - { 0, 2, 4, "Key: R" }, - { 0, 2, 5, "Key: T" }, - { 0, 2, 6, "Key: Y" }, - { 0, 2, 7, "Key: U" }, - { 0, 2, 8, "Key: I" }, - { 0, 2, 9, "Key: O" }, - { 0, 2, 10, "Key: P" }, - { 0, 2, 11, "Key: [" }, - { 0, 2, 12, "Key: ]" }, - { 0, 2, 13, "Key: \\ (ANSI)" }, - { 0, 2, 14, "Key: Delete" }, - { 0, 2, 15, "Key: End" }, - { 0, 2, 16, "Key: Page Down" }, - { 0, 2, 17, "Key: Number Pad 7" }, - { 0, 2, 18, "Key: Number Pad 8" }, - { 0, 2, 19, "Key: Number Pad 9" }, - { 0, 2, 20, "Key: Number Pad +" }, - { 0, 3, 0, "Key: Caps Lock" }, - { 0, 3, 1, "Key: A" }, - { 0, 3, 2, "Key: S" }, - { 0, 3, 3, "Key: D" }, - { 0, 3, 4, "Key: F" }, - { 0, 3, 5, "Key: G" }, - { 0, 3, 6, "Key: H" }, - { 0, 3, 7, "Key: J" }, - { 0, 3, 8, "Key: K" }, - { 0, 3, 9, "Key: L" }, - { 0, 3, 10, "Key: ;" }, - { 0, 3, 11, "Key: '" }, - { 0, 3, 12, "Key: #" }, - { 0, 3, 13, "Key: Enter" }, - { 0, 3, 17, "Key: Number Pad 4" }, - { 0, 3, 18, "Key: Number Pad 5" }, - { 0, 3, 19, "Key: Number Pad 6" }, - { 0, 4, 0, "Key: Left Shift" }, - { 0, 4, 1, "Key: \\ (ISO)" }, - { 0, 4, 2, "Key: Z" }, - { 0, 4, 3, "Key: X" }, - { 0, 4, 4, "Key: C" }, - { 0, 4, 5, "Key: V" }, - { 0, 4, 6, "Key: B" }, - { 0, 4, 7, "Key: N" }, - { 0, 4, 8, "Key: M" }, - { 0, 4, 9, "Key: ," }, - { 0, 4, 10, "Key: ." }, - { 0, 4, 11, "Key: /" }, - { 0, 4, 13, "Key: Right Shift" }, - { 0, 4, 15, "Key: Up Arrow" }, - { 0, 4, 17, "Key: Number Pad 1" }, - { 0, 4, 18, "Key: Number Pad 2" }, - { 0, 4, 19, "Key: Number Pad 3" }, - { 0, 4, 20, "Key: Number Pad Enter" }, - { 0, 5, 0, "Key: Left Control" }, - { 0, 5, 1, "Key: Left Windows" }, - { 0, 5, 2, "Key: Left Alt" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, - { 0, 5, 11, "Key: Right Fn" }, - { 0, 5, 12, "Key: Menu" }, - { 0, 5, 13, "Key: Right Control" }, - { 0, 5, 14, "Key: Left Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, - { 0, 5, 16, "Key: Right Arrow" }, - { 0, 5, 18, "Key: Number Pad 0" }, - { 0, 5, 19, "Key: Number Pad ." }, + { 0, 0, 0, KEY_EN_ESCAPE }, + { 0, 0, 2, KEY_EN_F1 }, + { 0, 0, 3, KEY_EN_F2 }, + { 0, 0, 4, KEY_EN_F3 }, + { 0, 0, 5, KEY_EN_F4 }, + { 0, 0, 6, KEY_EN_F5 }, + { 0, 0, 7, KEY_EN_F6 }, + { 0, 0, 8, KEY_EN_F7 }, + { 0, 0, 9, KEY_EN_F8 }, + { 0, 0, 10, KEY_EN_F9 }, + { 0, 0, 11, KEY_EN_F10 }, + { 0, 0, 12, KEY_EN_F11 }, + { 0, 0, 13, KEY_EN_F12 }, + { 0, 0, 14, KEY_EN_PRINT_SCREEN }, + { 0, 0, 15, KEY_EN_SCROLL_LOCK }, + { 0, 0, 16, KEY_EN_PAUSE_BREAK }, + { 0, 0, 17, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 18, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 19, KEY_EN_MEDIA_NEXT }, + { 0, 0, 20, KEY_EN_MEDIA_MUTE }, + { 0, 1, 0, KEY_EN_BACK_TICK }, + { 0, 1, 1, KEY_EN_1 }, + { 0, 1, 2, KEY_EN_2 }, + { 0, 1, 3, KEY_EN_3 }, + { 0, 1, 4, KEY_EN_4 }, + { 0, 1, 5, KEY_EN_5 }, + { 0, 1, 6, KEY_EN_6 }, + { 0, 1, 7, KEY_EN_7 }, + { 0, 1, 8, KEY_EN_8 }, + { 0, 1, 9, KEY_EN_9 }, + { 0, 1, 10, KEY_EN_0 }, + { 0, 1, 11, KEY_EN_MINUS }, + { 0, 1, 12, KEY_EN_EQUALS }, + { 0, 1, 13, KEY_EN_BACKSPACE }, + { 0, 1, 14, KEY_EN_INSERT }, + { 0, 1, 15, KEY_EN_HOME }, + { 0, 1, 16, KEY_EN_PAGE_UP }, + { 0, 1, 17, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 18, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 19, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 20, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 0, KEY_EN_TAB }, + { 0, 2, 1, KEY_EN_Q }, + { 0, 2, 2, KEY_EN_W }, + { 0, 2, 3, KEY_EN_E }, + { 0, 2, 4, KEY_EN_R }, + { 0, 2, 5, KEY_EN_T }, + { 0, 2, 6, KEY_EN_Y }, + { 0, 2, 7, KEY_EN_U }, + { 0, 2, 8, KEY_EN_I }, + { 0, 2, 9, KEY_EN_O }, + { 0, 2, 10, KEY_EN_P }, + { 0, 2, 11, KEY_EN_LEFT_BRACKET }, + { 0, 2, 12, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 13, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 14, KEY_EN_DELETE }, + { 0, 2, 15, KEY_EN_END }, + { 0, 2, 16, KEY_EN_PAGE_DOWN }, + { 0, 2, 17, KEY_EN_NUMPAD_7 }, + { 0, 2, 18, KEY_EN_NUMPAD_8 }, + { 0, 2, 19, KEY_EN_NUMPAD_9 }, + { 0, 2, 20, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 0, KEY_EN_CAPS_LOCK }, + { 0, 3, 1, KEY_EN_A }, + { 0, 3, 2, KEY_EN_S }, + { 0, 3, 3, KEY_EN_D }, + { 0, 3, 4, KEY_EN_F }, + { 0, 3, 5, KEY_EN_G }, + { 0, 3, 6, KEY_EN_H }, + { 0, 3, 7, KEY_EN_J }, + { 0, 3, 8, KEY_EN_K }, + { 0, 3, 9, KEY_EN_L }, + { 0, 3, 10, KEY_EN_SEMICOLON }, + { 0, 3, 11, KEY_EN_QUOTE }, + { 0, 3, 12, KEY_EN_POUND }, + { 0, 3, 13, KEY_EN_ANSI_ENTER }, + { 0, 3, 17, KEY_EN_NUMPAD_4 }, + { 0, 3, 18, KEY_EN_NUMPAD_5 }, + { 0, 3, 19, KEY_EN_NUMPAD_6 }, + { 0, 4, 0, KEY_EN_LEFT_SHIFT }, + { 0, 4, 1, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 2, KEY_EN_Z }, + { 0, 4, 3, KEY_EN_X }, + { 0, 4, 4, KEY_EN_C }, + { 0, 4, 5, KEY_EN_V }, + { 0, 4, 6, KEY_EN_B }, + { 0, 4, 7, KEY_EN_N }, + { 0, 4, 8, KEY_EN_M }, + { 0, 4, 9, KEY_EN_COMMA }, + { 0, 4, 10, KEY_EN_PERIOD }, + { 0, 4, 11, KEY_EN_FORWARD_SLASH }, + { 0, 4, 13, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 15, KEY_EN_UP_ARROW }, + { 0, 4, 17, KEY_EN_NUMPAD_1 }, + { 0, 4, 18, KEY_EN_NUMPAD_2 }, + { 0, 4, 19, KEY_EN_NUMPAD_3 }, + { 0, 4, 20, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 0, KEY_EN_LEFT_CONTROL }, + { 0, 5, 1, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 2, KEY_EN_LEFT_ALT }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 12, KEY_EN_MENU }, + { 0, 5, 13, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 14, KEY_EN_LEFT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, + { 0, 5, 16, KEY_EN_RIGHT_ARROW }, + { 0, 5, 18, KEY_EN_NUMPAD_0 }, + { 0, 5, 19, KEY_EN_NUMPAD_PERIOD }, }; #define HUNTSMAN_V2_TKL_KEYMAP_SIZE (sizeof(huntsman_v2_tkl_keymap) / sizeof(huntsman_v2_tkl_keymap[0])) @@ -1948,95 +1949,95 @@ static const razer_key huntsman_v2_tkl_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, }; #define BLACKWIDOW_ELITE_KEYMAP_SIZE (sizeof(blackwidow_elite_keymap) / sizeof(blackwidow_elite_keymap[0])) @@ -2046,117 +2047,117 @@ static const razer_key blackwidow_elite_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 0, 18, "Key: Media Previous" }, - { 0, 0, 19, "Key: Media Play/Pause" }, - { 0, 0, 20, "Key: Media Next" }, - { 0, 0, 21, "Key: Media Mute" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 0, 18, KEY_EN_MEDIA_PREVIOUS }, + { 0, 0, 19, KEY_EN_MEDIA_PLAY_PAUSE }, + { 0, 0, 20, KEY_EN_MEDIA_NEXT }, + { 0, 0, 21, KEY_EN_MEDIA_MUTE }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, { 0, 5, 11, "Logo" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define BLACKWIDOW_CHROMA_V2_KEYMAP_SIZE (sizeof(blackwidow_chroma_v2_keymap) / sizeof(blackwidow_chroma_v2_keymap[0])) @@ -2166,116 +2167,116 @@ static const razer_key blackwidow_chroma_v2_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, { 0, 0, 20, "Logo" }, { 0, 1, 0, "Key: M1" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, { 0, 2, 0, "Key: M2" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, { 0, 3, 0, "Key: M3" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, { 0, 4, 0, "Key: M4" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, { 0, 5, 0, "Key: M5" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define BLACKWIDOW_2019_KEYMAP_SIZE (sizeof(blackwidow_2019_keymap) / sizeof(blackwidow_2019_keymap[0])) @@ -2285,112 +2286,112 @@ static const razer_key blackwidow_2019_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, { 0, 5, 11, "Logo" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, { 0, 5, 20, "Key: Number Pad ," }, }; @@ -2401,111 +2402,111 @@ static const razer_key blackwidow_v3_pro_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 6, "Key: Space" }, - { 0, 5, 10, "Key: Right Alt" }, - { 0, 5, 11, "Key: Right Fn" }, - { 0, 5, 12, "Key: Menu" }, - { 0, 5, 13, "Key: Right Control" }, - { 0, 5, 14, "Key: Left Arrow" }, - { 0, 5, 15, "Key: Down Arrow" }, - { 0, 5, 16, "Key: Right Arrow" }, - { 0, 5, 18, "Key: Number Pad 0" }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 6, KEY_EN_SPACE }, + { 0, 5, 10, KEY_EN_RIGHT_ALT }, + { 0, 5, 11, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 12, KEY_EN_MENU }, + { 0, 5, 13, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 14, KEY_EN_LEFT_ARROW }, + { 0, 5, 15, KEY_EN_DOWN_ARROW }, + { 0, 5, 16, KEY_EN_RIGHT_ARROW }, + { 0, 5, 18, KEY_EN_NUMPAD_0 }, { 0, 5, 19, "Key: Number Pad ," }, }; @@ -2516,112 +2517,112 @@ static const razer_key ornata_chroma_keymap[] = /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | \*---------------------------------------------------------------------*/ - { 0, 0, 1, "Key: Escape" }, - { 0, 0, 3, "Key: F1" }, - { 0, 0, 4, "Key: F2" }, - { 0, 0, 5, "Key: F3" }, - { 0, 0, 6, "Key: F4" }, - { 0, 0, 7, "Key: F5" }, - { 0, 0, 8, "Key: F6" }, - { 0, 0, 9, "Key: F7" }, - { 0, 0, 10, "Key: F8" }, - { 0, 0, 11, "Key: F9" }, - { 0, 0, 12, "Key: F10" }, - { 0, 0, 13, "Key: F11" }, - { 0, 0, 14, "Key: F12" }, - { 0, 0, 15, "Key: Print Screen" }, - { 0, 0, 16, "Key: Scroll Lock" }, - { 0, 0, 17, "Key: Pause/Break" }, - { 0, 1, 1, "Key: `" }, - { 0, 1, 2, "Key: 1" }, - { 0, 1, 3, "Key: 2" }, - { 0, 1, 4, "Key: 3" }, - { 0, 1, 5, "Key: 4" }, - { 0, 1, 6, "Key: 5" }, - { 0, 1, 7, "Key: 6" }, - { 0, 1, 8, "Key: 7" }, - { 0, 1, 9, "Key: 8" }, - { 0, 1, 10, "Key: 9" }, - { 0, 1, 11, "Key: 0" }, - { 0, 1, 12, "Key: -" }, - { 0, 1, 13, "Key: =" }, - { 0, 1, 14, "Key: Backspace" }, - { 0, 1, 15, "Key: Insert" }, - { 0, 1, 16, "Key: Home" }, - { 0, 1, 17, "Key: Page Up" }, - { 0, 1, 18, "Key: Num Lock" }, - { 0, 1, 19, "Key: Number Pad /" }, - { 0, 1, 20, "Key: Number Pad *" }, - { 0, 1, 21, "Key: Number Pad -" }, - { 0, 2, 1, "Key: Tab" }, - { 0, 2, 2, "Key: Q" }, - { 0, 2, 3, "Key: W" }, - { 0, 2, 4, "Key: E" }, - { 0, 2, 5, "Key: R" }, - { 0, 2, 6, "Key: T" }, - { 0, 2, 7, "Key: Y" }, - { 0, 2, 8, "Key: U" }, - { 0, 2, 9, "Key: I" }, - { 0, 2, 10, "Key: O" }, - { 0, 2, 11, "Key: P" }, - { 0, 2, 12, "Key: [" }, - { 0, 2, 13, "Key: ]" }, - { 0, 2, 14, "Key: \\ (ANSI)" }, - { 0, 2, 15, "Key: Delete" }, - { 0, 2, 16, "Key: End" }, - { 0, 2, 17, "Key: Page Down" }, - { 0, 2, 18, "Key: Number Pad 7" }, - { 0, 2, 19, "Key: Number Pad 8" }, - { 0, 2, 20, "Key: Number Pad 9" }, - { 0, 2, 21, "Key: Number Pad +" }, - { 0, 3, 1, "Key: Caps Lock" }, - { 0, 3, 2, "Key: A" }, - { 0, 3, 3, "Key: S" }, - { 0, 3, 4, "Key: D" }, - { 0, 3, 5, "Key: F" }, - { 0, 3, 6, "Key: G" }, - { 0, 3, 7, "Key: H" }, - { 0, 3, 8, "Key: J" }, - { 0, 3, 9, "Key: K" }, - { 0, 3, 10, "Key: L" }, - { 0, 3, 11, "Key: ;" }, - { 0, 3, 12, "Key: '" }, - { 0, 3, 13, "Key: #" }, - { 0, 3, 14, "Key: Enter" }, - { 0, 3, 18, "Key: Number Pad 4" }, - { 0, 3, 19, "Key: Number Pad 5" }, - { 0, 3, 20, "Key: Number Pad 6" }, - { 0, 4, 1, "Key: Left Shift" }, - { 0, 4, 2, "Key: \\ (ISO)" }, - { 0, 4, 3, "Key: Z" }, - { 0, 4, 4, "Key: X" }, - { 0, 4, 5, "Key: C" }, - { 0, 4, 6, "Key: V" }, - { 0, 4, 7, "Key: B" }, - { 0, 4, 8, "Key: N" }, - { 0, 4, 9, "Key: M" }, - { 0, 4, 10, "Key: ," }, - { 0, 4, 11, "Key: ." }, - { 0, 4, 12, "Key: /" }, - { 0, 4, 14, "Key: Right Shift" }, - { 0, 4, 16, "Key: Up Arrow" }, - { 0, 4, 18, "Key: Number Pad 1" }, - { 0, 4, 19, "Key: Number Pad 2" }, - { 0, 4, 20, "Key: Number Pad 3" }, - { 0, 4, 21, "Key: Number Pad Enter" }, - { 0, 5, 1, "Key: Left Control" }, - { 0, 5, 2, "Key: Left Windows" }, - { 0, 5, 3, "Key: Left Alt" }, - { 0, 5, 7, "Key: Space" }, - { 0, 5, 11, "Key: Right Alt" }, - { 0, 5, 12, "Key: Right Fn" }, - { 0, 5, 13, "Key: Menu" }, - { 0, 5, 14, "Key: Right Control" }, - { 0, 5, 15, "Key: Left Arrow" }, - { 0, 5, 16, "Key: Down Arrow" }, - { 0, 5, 17, "Key: Right Arrow" }, - { 0, 5, 19, "Key: Number Pad 0" }, - { 0, 5, 20, "Key: Number Pad ." }, + { 0, 0, 1, KEY_EN_ESCAPE }, + { 0, 0, 3, KEY_EN_F1 }, + { 0, 0, 4, KEY_EN_F2 }, + { 0, 0, 5, KEY_EN_F3 }, + { 0, 0, 6, KEY_EN_F4 }, + { 0, 0, 7, KEY_EN_F5 }, + { 0, 0, 8, KEY_EN_F6 }, + { 0, 0, 9, KEY_EN_F7 }, + { 0, 0, 10, KEY_EN_F8 }, + { 0, 0, 11, KEY_EN_F9 }, + { 0, 0, 12, KEY_EN_F10 }, + { 0, 0, 13, KEY_EN_F11 }, + { 0, 0, 14, KEY_EN_F12 }, + { 0, 0, 15, KEY_EN_PRINT_SCREEN }, + { 0, 0, 16, KEY_EN_SCROLL_LOCK }, + { 0, 0, 17, KEY_EN_PAUSE_BREAK }, + { 0, 1, 1, KEY_EN_BACK_TICK }, + { 0, 1, 2, KEY_EN_1 }, + { 0, 1, 3, KEY_EN_2 }, + { 0, 1, 4, KEY_EN_3 }, + { 0, 1, 5, KEY_EN_4 }, + { 0, 1, 6, KEY_EN_5 }, + { 0, 1, 7, KEY_EN_6 }, + { 0, 1, 8, KEY_EN_7 }, + { 0, 1, 9, KEY_EN_8 }, + { 0, 1, 10, KEY_EN_9 }, + { 0, 1, 11, KEY_EN_0 }, + { 0, 1, 12, KEY_EN_MINUS }, + { 0, 1, 13, KEY_EN_EQUALS }, + { 0, 1, 14, KEY_EN_BACKSPACE }, + { 0, 1, 15, KEY_EN_INSERT }, + { 0, 1, 16, KEY_EN_HOME }, + { 0, 1, 17, KEY_EN_PAGE_UP }, + { 0, 1, 18, KEY_EN_NUMPAD_LOCK }, + { 0, 1, 19, KEY_EN_NUMPAD_DIVIDE }, + { 0, 1, 20, KEY_EN_NUMPAD_TIMES }, + { 0, 1, 21, KEY_EN_NUMPAD_MINUS }, + { 0, 2, 1, KEY_EN_TAB }, + { 0, 2, 2, KEY_EN_Q }, + { 0, 2, 3, KEY_EN_W }, + { 0, 2, 4, KEY_EN_E }, + { 0, 2, 5, KEY_EN_R }, + { 0, 2, 6, KEY_EN_T }, + { 0, 2, 7, KEY_EN_Y }, + { 0, 2, 8, KEY_EN_U }, + { 0, 2, 9, KEY_EN_I }, + { 0, 2, 10, KEY_EN_O }, + { 0, 2, 11, KEY_EN_P }, + { 0, 2, 12, KEY_EN_LEFT_BRACKET }, + { 0, 2, 13, KEY_EN_RIGHT_BRACKET }, + { 0, 2, 14, KEY_EN_ANSI_BACK_SLASH }, + { 0, 2, 15, KEY_EN_DELETE }, + { 0, 2, 16, KEY_EN_END }, + { 0, 2, 17, KEY_EN_PAGE_DOWN }, + { 0, 2, 18, KEY_EN_NUMPAD_7 }, + { 0, 2, 19, KEY_EN_NUMPAD_8 }, + { 0, 2, 20, KEY_EN_NUMPAD_9 }, + { 0, 2, 21, KEY_EN_NUMPAD_PLUS }, + { 0, 3, 1, KEY_EN_CAPS_LOCK }, + { 0, 3, 2, KEY_EN_A }, + { 0, 3, 3, KEY_EN_S }, + { 0, 3, 4, KEY_EN_D }, + { 0, 3, 5, KEY_EN_F }, + { 0, 3, 6, KEY_EN_G }, + { 0, 3, 7, KEY_EN_H }, + { 0, 3, 8, KEY_EN_J }, + { 0, 3, 9, KEY_EN_K }, + { 0, 3, 10, KEY_EN_L }, + { 0, 3, 11, KEY_EN_SEMICOLON }, + { 0, 3, 12, KEY_EN_QUOTE }, + { 0, 3, 13, KEY_EN_POUND }, + { 0, 3, 14, KEY_EN_ANSI_ENTER }, + { 0, 3, 18, KEY_EN_NUMPAD_4 }, + { 0, 3, 19, KEY_EN_NUMPAD_5 }, + { 0, 3, 20, KEY_EN_NUMPAD_6 }, + { 0, 4, 1, KEY_EN_LEFT_SHIFT }, + { 0, 4, 2, KEY_EN_ISO_BACK_SLASH }, + { 0, 4, 3, KEY_EN_Z }, + { 0, 4, 4, KEY_EN_X }, + { 0, 4, 5, KEY_EN_C }, + { 0, 4, 6, KEY_EN_V }, + { 0, 4, 7, KEY_EN_B }, + { 0, 4, 8, KEY_EN_N }, + { 0, 4, 9, KEY_EN_M }, + { 0, 4, 10, KEY_EN_COMMA }, + { 0, 4, 11, KEY_EN_PERIOD }, + { 0, 4, 12, KEY_EN_FORWARD_SLASH }, + { 0, 4, 14, KEY_EN_RIGHT_SHIFT }, + { 0, 4, 16, KEY_EN_UP_ARROW }, + { 0, 4, 18, KEY_EN_NUMPAD_1 }, + { 0, 4, 19, KEY_EN_NUMPAD_2 }, + { 0, 4, 20, KEY_EN_NUMPAD_3 }, + { 0, 4, 21, KEY_EN_NUMPAD_ENTER }, + { 0, 5, 1, KEY_EN_LEFT_CONTROL }, + { 0, 5, 2, KEY_EN_LEFT_WINDOWS }, + { 0, 5, 3, KEY_EN_LEFT_ALT }, + { 0, 5, 7, KEY_EN_SPACE }, + { 0, 5, 11, KEY_EN_RIGHT_ALT }, + { 0, 5, 12, KEY_EN_RIGHT_FUNCTION }, + { 0, 5, 13, KEY_EN_MENU }, + { 0, 5, 14, KEY_EN_RIGHT_CONTROL }, + { 0, 5, 15, KEY_EN_LEFT_ARROW }, + { 0, 5, 16, KEY_EN_DOWN_ARROW }, + { 0, 5, 17, KEY_EN_RIGHT_ARROW }, + { 0, 5, 19, KEY_EN_NUMPAD_0 }, + { 0, 5, 20, KEY_EN_NUMPAD_PERIOD }, }; #define TARTARUS_V2_KEYMAP_SIZE (sizeof(tartarus_v2_keymap) / sizeof(tartarus_v2_keymap[0])) diff --git a/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp b/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp index 2ed2b48c..bd6ffc3d 100644 --- a/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp +++ b/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp @@ -7,6 +7,7 @@ | Mola19 17/12/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_RoccatVulcanAimo.h" #include @@ -24,138 +25,138 @@ static const unsigned int zone_size = 132; static const char *led_names[] = { - "Key: Escape", + KEY_EN_ESCAPE, "Key: ^", - "Key: Tab", - "Key: Caps Lock", - "Key: Left Shift", - "Key: Left Control", - "Key: 1", - "Key: Q", - "Key: A", + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, "Key: <", - "Key: Left Windows", - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: Y", - "Key: Left Alt", - "Key: F2", - "Key: 3", - "Key: E", - "Key: D", - "Key: X", - "Unused", - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: C", - "Key: F4", - "Key: 5", - "Key: T", - "Key: G", - "Key: V", - "Key: 6", - "Key: Z", - "Key: H", - "Key: B", - "Key: Space", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Key: F5", - "Key: 7", - "Key: U", - "Key: J", - "Key: N", - "Key: F6", - "Key: 8", - "Key: I", - "Key: K", - "Key: M", - "Unused", - "Key: F7", - "Key: 9", - "Key: O", - "Key: L", - "Key: ,", - "Unused", - "Key: F8", - "Key: 0", - "Key: P", + KEY_EN_LEFT_WINDOWS, + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_Y, + KEY_EN_LEFT_ALT, + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_X, + KEY_EN_UNUSED, + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_C, + KEY_EN_F4, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_V, + KEY_EN_6, + KEY_EN_Z, + KEY_EN_H, + KEY_EN_B, + KEY_EN_SPACE, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_F5, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_N, + KEY_EN_F6, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_M, + KEY_EN_UNUSED, + KEY_EN_F7, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_COMMA, + KEY_EN_UNUSED, + KEY_EN_F8, + KEY_EN_0, + KEY_EN_P, "Key: Ö", - "Key: .", - "Key: Right Alt", - "Unused", + KEY_EN_PERIOD, + KEY_EN_RIGHT_ALT, + KEY_EN_UNUSED, "Key: ß", "Key: Ü", "Key: Ä", - "Key: -", - "Key: Right Fn", - "Unused", - "Key: F9", + KEY_EN_MINUS, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_UNUSED, + KEY_EN_F9, "Key: ´", "Key: +", - "Unused", - "Key: Right Shift", - "Key: Menu", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Backspace", - "Key: Enter", - "Key: Right Control", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Unused", - "Key: #", - "Unused", - "Unused", - "Key: Print Screen", - "Key: Insert", - "Key: Delete", - "Key: Left Arrow", - "Key: Scroll Lock", - "Key: Home", - "Key: End", - "Key: Up Arrow", - "Key: Down Arrow", - "Key: Pause/Break", - "Key: Page Up", - "Key: Page Down", - "Key: Right Arrow", - "Unused", - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Key: Number Pad 0", - "Unused", - "Key: Number Pad /", - "Key: Number Pad 8", - "Key: Number Pad 5", - "Key: Number Pad 2", - "Unused", - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", + KEY_EN_UNUSED, + KEY_EN_RIGHT_SHIFT, + KEY_EN_MENU, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_BACKSPACE, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_CONTROL, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_POUND, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, + KEY_EN_LEFT_ARROW, + KEY_EN_SCROLL_LOCK, + KEY_EN_HOME, + KEY_EN_END, + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_PAUSE_BREAK, + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, + KEY_EN_RIGHT_ARROW, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_0, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, "Key: Number Pad ,", - "Key: Number Pad -", - "Key: Number Pad +", - "Key: Number Pad Enter", + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_ENTER, }; RGBController_RoccatVulcanAimo::RGBController_RoccatVulcanAimo(RoccatVulcanAimoController* controller_ptr) diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp b/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp index 17b1d51c..3f41ef5b 100644 --- a/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp +++ b/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp @@ -8,6 +8,7 @@ | Dmitri Kalinichenko (Dima-Kal) 23/06/2021 | \*-----------------------------------------=*/ +#include "RGBControllerKeyNames.h" #include "RGBController_SinowealthKeyboard.h" #define NA 0xFFFFFFFF @@ -23,98 +24,98 @@ static unsigned int tkl_matrix_map[6][17] = static const char *led_names_tkl[] = { - "Key: Escape", - "Key: F1", - "Key: F2", - "Key: F3", - "Key: F4", - "Key: F5", - "Key: F6", - "Key: F7", - "Key: F8", - "Key: F9", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Print Screen", - "Key: Scroll Lock", + KEY_EN_ESCAPE, + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, "Key: Pause", - "Key: `", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: 7", - "Key: 8", - "Key: 9", - "Key: 0", - "Key: -", - "Key: =", - "Key: Backspace", - "Key: Insert", - "Key: Home", - "Key: Page Up", + KEY_EN_BACK_TICK, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_BACKSPACE, + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, - "Key: Tab", - "Key: Q", - "Key: W", - "Key: E", - "Key: R", - "Key: T", - "Key: Y", - "Key: U", - "Key: I", - "Key: O", - "Key: P", - "Key: [", - "Key: ]", - "Key: \\", - "Key: Delete", - "Key: End", - "Key: Page Down", + KEY_EN_TAB, + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_Y, + KEY_EN_U, + KEY_EN_I, + KEY_EN_O, + KEY_EN_P, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, - "Key: Caps Lock", - "Key: A", - "Key: S", - "Key: D", - "Key: F", - "Key: G", - "Key: H", - "Key: J", - "Key: K", - "Key: L", - "Key: ;", - "Key: '", - "Key: Enter", + KEY_EN_CAPS_LOCK, + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_ANSI_ENTER, - "Key: Left Shift", - "Key: Z", - "Key: X", - "Key: C", - "Key: V", - "Key: B", - "Key: N", - "Key: M", - "Key: ,", - "Key: .", - "Key: /", - "Key: Right Shift", - "Key: Up Arrow", + KEY_EN_LEFT_SHIFT, + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_N, + KEY_EN_M, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_SHIFT, + KEY_EN_UP_ARROW, - "Key: Left Control", - "Key: Left Windows", - "Key: Left Alt", - "Key: Space", - "Key: Right Control", - "Key: Right Alt", - "Key: Right Windows", - "Key: Right Fn", - "Key: Left Arrow", - "Key: Down Arrow", - "Key: Right Arrow", + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, + KEY_EN_SPACE, + KEY_EN_RIGHT_CONTROL, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_RIGHT_ARROW, }; RGBController_SinowealthKeyboard::RGBController_SinowealthKeyboard(SinowealthKeyboardController* sinowealth_ptr) diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp b/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp index 743814d9..f2e4e71e 100644 --- a/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp +++ b/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp @@ -11,6 +11,7 @@ | Dmitri Kalinichenko (Dima-Kal) 23/06/2021 | \*-----------------------------------------=*/ +#include "RGBControllerKeyNames.h" #include "RGBController_SinowealthKeyboard16.h" #include @@ -29,142 +30,143 @@ static unsigned int matrix_map[6][22] = static const char *led_names_tkl[] = { - "Key: Escape", - "", - "Key: F1", - "Key: F2", - "Key: F3", - "Key: F4", - "", - "Key: F5", - "Key: F6", - "Key: F7", - "Key: F8", - "Key: F9", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Print Screen", - "Key: Scroll Lock", - "Key: Pause/Break", - "", - "", - "", - "", + KEY_EN_ESCAPE, + KEY_EN_UNUSED, + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_UNUSED, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, + KEY_EN_PAUSE_BREAK, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, - "Key: `", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: 7", - "Key: 8", - "Key: 9", - "Key: 0", - "Key: -", - "Key: =", - "Undefined", - "Key: Backspace", - "Key: Insert", - "Key: Home", - "Key: Page Up", - "Key: Num Lock", - "Key: Number Pad /", - "Key: Number Pad *", - "Key: Number Pad -", + KEY_EN_BACK_TICK, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_UNUSED, + KEY_EN_BACKSPACE, + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_MINUS, - "Key: Tab", - "Key: Q", - "Key: W", - "Key: E", - "Key: R", - "Key: T", - "Key: Y", - "Key: U", - "Key: I", - "Key: O", - "Key: P", - "Key: [", - "Key: ]", - "Key: \\ (ANSI)", - "", - "Key: Delete", - "Key: End", - "Key: Page Down", - "Key: Number Pad 7", - "Key: Number Pad 8", - "Key: Number Pad 9", - "Key: Number Pad +", + KEY_EN_TAB, + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_Y, + KEY_EN_U, + KEY_EN_I, + KEY_EN_O, + KEY_EN_P, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_UNUSED, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_PLUS, - "Key: Caps Lock", - "Key: A", - "Key: S", - "Key: D", - "Key: F", - "Key: G", - "Key: H", - "Key: J", - "Key: K", - "Key: L", - "Key: ;", - "Key: '", - "", - "Key: Enter", - "", - "", - "", - "", - "Key: Number Pad 4", - "Key: Number Pad 5", - "Key: Number Pad 6", - "Key: Number Pad +", + KEY_EN_CAPS_LOCK, + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_UNUSED, + KEY_EN_ANSI_ENTER, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_PLUS, - "Key: Left Shift", - "", - "Key: Z", - "Key: X", - "Key: C", - "Key: V", - "Key: B", - "Key: N", - "Key: M", - "Key: ,", - "Key: .", - "Key: /", - "", - "", - "Key: Right Shift", - "", - "Key: Up Arrow", - "", - "Key: Number Pad 1", - "Key: Number Pad 2", - "Key: Number Pad 3", - "Key: Number Pad Enter", + KEY_EN_LEFT_SHIFT, + KEY_EN_UNUSED, + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_N, + KEY_EN_M, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_SHIFT, + KEY_EN_UNUSED, + KEY_EN_UP_ARROW, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_ENTER, - "Key: Left Control", - "Key: Left Windows", - "Key: Left Alt", - "", - "", - "Key: Space", - "","", - "Key: Right Alt", - "Key: Right Fn", - "Key: Right Windows", - "", - "Key: Right Control", - "", - "", - "Key: Left Arrow", - "Key: Down Arrow", - "Key: Right Arrow", - "Key: Number Pad 0", - "Key: Number Pad 0", - "Key: Number Pad .", - "Key: Number Pad Enter" + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_SPACE, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_UNUSED, + KEY_EN_RIGHT_CONTROL, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_RIGHT_ARROW, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_PERIOD, + KEY_EN_NUMPAD_ENTER }; RGBController_SinowealthKeyboard16::RGBController_SinowealthKeyboard16(SinowealthKeyboard16Controller* sinowealth_ptr) diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp index f5785718..b29165b6 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp @@ -7,6 +7,7 @@ | Eric Samuelson (edbgon) 7/5/2020 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_SteelSeriesApex.h" using namespace std::chrono_literals; @@ -52,112 +53,112 @@ static const unsigned int zone_sizes_tkl[] = static const char *led_names[] = { - "Key: A", - "Key: B", - "Key: C", - "Key: D", - "Key: E", - "Key: F", - "Key: G", - "Key: H", - "Key: I", - "Key: J", - "Key: K", - "Key: L", - "Key: M", - "Key: N", - "Key: O", - "Key: P", - "Key: Q", - "Key: R", - "Key: S", - "Key: T", - "Key: U", - "Key: V", - "Key: W", - "Key: X", - "Key: Y", - "Key: Z", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: 7", - "Key: 8", - "Key: 9", - "Key: 0", - "Key: Enter", - "Key: Escape", - "Key: Backspace", - "Key: Tab", - "Key: Space", - "Key: -", - "Key: =", - "Key: [", - "Key: ]", - "Key: #", - "Key: ;", - "Key: '", - "Key: `", - "Key: ,", - "Key: .", - "Key: /", - "Key: Caps Lock", - "Key: F1", - "Key: F2", - "Key: F3", - "Key: F4", - "Key: F5", - "Key: F6", - "Key: F7", - "Key: F8", - "Key: F9", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Print Screen", - "Key: Scroll Lock", + KEY_EN_A, + KEY_EN_B, + KEY_EN_C, + KEY_EN_D, + KEY_EN_E, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_I, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_M, + KEY_EN_N, + KEY_EN_O, + KEY_EN_P, + KEY_EN_Q, + KEY_EN_R, + KEY_EN_S, + KEY_EN_T, + KEY_EN_U, + KEY_EN_V, + KEY_EN_W, + KEY_EN_X, + KEY_EN_Y, + KEY_EN_Z, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_ANSI_ENTER, + KEY_EN_ESCAPE, + KEY_EN_BACKSPACE, + KEY_EN_TAB, + KEY_EN_SPACE, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_POUND, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_BACK_TICK, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_CAPS_LOCK, + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, "Key: Pause", - "Key: Insert", - "Key: Home", - "Key: Page Up", - "Key: Delete", - "Key: End", - "Key: Page Down", - "Key: Right Arrow", - "Key: Left Arrow", - "Key: Down Arrow", - "Key: Up Arrow", - "Key: \\ (ISO)", - "Key: Left Control", - "Key: Left Shift", - "Key: Left Alt", - "Key: Left Windows", - "Key: Right Control", - "Key: Right Shift", - "Key: Right Alt", - "Key: Right Windows", - "Key: Right Fn", - "Key: \\ (ANSI)", - "Key: Num Lock", - "Key: Number Pad /", - "Key: Number Pad *", - "Key: Number Pad -", - "Key: Number Pad +", - "Key: Number Pad Enter", - "Key: Number Pad 1", - "Key: Number Pad 2", - "Key: Number Pad 3", - "Key: Number Pad 4", - "Key: Number Pad 5", - "Key: Number Pad 6", - "Key: Number Pad 7", - "Key: Number Pad 8", - "Key: Number Pad 9", - "Key: Number Pad 0", - "Key: Number Pad .", + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, + KEY_EN_RIGHT_ARROW, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_UP_ARROW, + KEY_EN_ISO_BACK_SLASH, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_ALT, + KEY_EN_LEFT_WINDOWS, + KEY_EN_RIGHT_CONTROL, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_PERIOD, }; RGBController_SteelSeriesApex::RGBController_SteelSeriesApex(SteelSeriesApexBaseController* steelseries_ptr) diff --git a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp index c0af3160..4ecb8899 100644 --- a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp @@ -7,6 +7,7 @@ | Adam Honse (CalcProgrammer1) 12/25/2019 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_ThermaltakePoseidonZRGB.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -37,110 +38,110 @@ 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: Left Arrow", - "Key: Insert", - "Key: F1", - "Key: 1", - "Key: Q", - "Key: A", - "Key: Left Windows", - "Key: Down Arrow", - "Key: Delete", - "Key: F2", - "Key: 2", - "Key: W", - "Key: S", - "Key: Left Alt", - "Key: Right Arrow", - "Key: Home", - "Key: F3", - "Key: 3", - "Key: E", - "Key: D", - "Key: Z", - "Key: Up Arrow", - "Key: End", - "Key: F4", - "Key: 4", - "Key: R", - "Key: F", - "Key: X", - "Key: Space", - "Key: Number Pad 4", - "Key: Page Up", - "Key: F5", - "Key: 5", - "Key: T", - "Key: G", - "Key: C", - "Key: Number Pad 1", - "Key: Page Down", - "Key: F6", - "Key: 6", - "Key: Y", - "Key: H", - "Key: V", - "Key: Number Pad 2", - "Key: Num Lock", - "Key: F7", - "Key: 7", - "Key: U", - "Key: J", - "Key: B", - "Key: Number Pad 0", - "Key: Number Pad 7", - "Key: F8", - "Key: 8", - "Key: I", - "Key: K", - "Key: N", - "Key: Number Pad 6", - "Key: Number Pad /", - "Key: F9", - "Key: 9", - "Key: O", - "Key: L", - "Key: M", - "Key: Right Alt", - "Key: Number Pad 3", - "Key: Number Pad 8", - "Key: F10", - "Key: 0", - "Key: P", - "Key: ;", - "Key: ,", - "Key: Right Fn", - "Key: Number Pad .", - "Key: Number Pad *", - "Key: F11", - "Key: -", - "Key: [", - "Key: '", - "Key: .", - "Key: Number Pad +", - "Key: Number Pad 9", - "Key: F12", - "Key: =", - "Key: ]", - "Key: /", - "Key: Menu", - "Key: Number Pad -", - "Key: Print Screen", - "Key: \\ (ANSI)", - "Key: Enter", - "Key: Right Control", - "Key: Number Pad Enter", - "Key: Number Pad 5", - "Key: Scroll Lock", - "Key: Right Shift", - "Key: Pause/Break", - "Key: Backspace" + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_ARROW, + KEY_EN_INSERT, + KEY_EN_F1, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_LEFT_WINDOWS, + KEY_EN_DOWN_ARROW, + KEY_EN_DELETE, + KEY_EN_F2, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_LEFT_ALT, + KEY_EN_RIGHT_ARROW, + KEY_EN_HOME, + KEY_EN_F3, + KEY_EN_3, + KEY_EN_E, + KEY_EN_D, + KEY_EN_Z, + KEY_EN_UP_ARROW, + KEY_EN_END, + KEY_EN_F4, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_X, + KEY_EN_SPACE, + KEY_EN_NUMPAD_4, + KEY_EN_PAGE_UP, + KEY_EN_F5, + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_C, + KEY_EN_NUMPAD_1, + KEY_EN_PAGE_DOWN, + KEY_EN_F6, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_V, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_LOCK, + KEY_EN_F7, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_B, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_7, + KEY_EN_F8, + KEY_EN_8, + KEY_EN_I, + KEY_EN_K, + KEY_EN_N, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_F9, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_M, + KEY_EN_RIGHT_ALT, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_8, + KEY_EN_F10, + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_COMMA, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_NUMPAD_PERIOD, + KEY_EN_NUMPAD_TIMES, + KEY_EN_F11, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_PERIOD, + KEY_EN_NUMPAD_PLUS, + KEY_EN_NUMPAD_9, + KEY_EN_F12, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_FORWARD_SLASH, + KEY_EN_MENU, + KEY_EN_NUMPAD_MINUS, + KEY_EN_PRINT_SCREEN, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_CONTROL, + KEY_EN_NUMPAD_ENTER, + KEY_EN_NUMPAD_5, + KEY_EN_SCROLL_LOCK, + KEY_EN_RIGHT_SHIFT, + KEY_EN_PAUSE_BREAK, + KEY_EN_BACKSPACE }; RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* poseidon_ptr) diff --git a/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp b/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp index 541e15c0..aa16be62 100644 --- a/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp +++ b/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp @@ -7,6 +7,7 @@ | Diogo Trindade (diogotr7) 3/4/2021 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_WootingKeyboard.h" #include "LogManager.h" @@ -42,132 +43,132 @@ 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", - "Unused", - "Key: 1", - "Key: Q", - "Key: A", - "Key: \\ (ISO)", //iso key - 10 - "Key: Left Windows", - "Key: F1", - "Key: 2", - "Key: W", - "Key: S", - "Key: Z", - "Key: Left Alt", - "Key: F2", - "Key: 3", - "Key: E", //20 - "Key: D", - "Key: X", - "Unused", //space - "Key: F3", - "Key: 4", - "Key: R", - "Key: F", - "Key: C", - "Unused", //space - "Key: F4", //30 - "Key: 5", - "Key: T", - "Key: G", - "Key: V", - "Unused", //space - "Key: F5", - "Key: 6", - "Key: Y", - "Key: H", - "Key: B", //40 - "Key: Space", - "Key: F6", - "Key: 7", - "Key: U", - "Key: J", - "Key: N", - "Unused", //space - "Key: F7", - "Key: 8", - "Key: I", //50 - "Key: K", - "Key: M", - "Unused", //space - "Key: F8", - "Key: 9", - "Key: O", - "Key: L", - "Key: ,", - "Unused", //space - "Key: F9", //60 - "Key: 0", - "Key: P", - "Key: ;", - "Key: .", - "Key: Right Alt", - "Key: F10", - "Key: -", - "Key: [", - "Key: '", - "Key: /", //70 - "Key: Right Windows", - "Key: F11", - "Key: =", - "Key: ]", - "Key: #", //iso only - "Unused", - "Key: Right Fn", - "Key: F12", - "Key: Backspace", - "Key: \\ (ANSI)", //80 - "Key: Enter", - "Key: Right Shift", - "Key: Right Control", - "Key: Print Screen", - "Key: Insert", - "Key: Delete", - "Unused", - "Unused", - "Key: Left Arrow", - "Key: Pause/Break", //90 - "Key: Home", - "Key: End", - "Unused", - "Key: Up Arrow", - "Key: Down Arrow", + KEY_EN_ESCAPE, + KEY_EN_BACK_TICK, + KEY_EN_TAB, + KEY_EN_CAPS_LOCK, + KEY_EN_LEFT_SHIFT, + KEY_EN_LEFT_CONTROL, + KEY_EN_UNUSED, + KEY_EN_1, + KEY_EN_Q, + KEY_EN_A, + KEY_EN_ISO_BACK_SLASH, //iso key - 10 + KEY_EN_LEFT_WINDOWS, + KEY_EN_F1, + KEY_EN_2, + KEY_EN_W, + KEY_EN_S, + KEY_EN_Z, + KEY_EN_LEFT_ALT, + KEY_EN_F2, + KEY_EN_3, + KEY_EN_E, //20 + KEY_EN_D, + KEY_EN_X, + KEY_EN_UNUSED, //space + KEY_EN_F3, + KEY_EN_4, + KEY_EN_R, + KEY_EN_F, + KEY_EN_C, + KEY_EN_UNUSED, //space + KEY_EN_F4, //30 + KEY_EN_5, + KEY_EN_T, + KEY_EN_G, + KEY_EN_V, + KEY_EN_UNUSED, //space + KEY_EN_F5, + KEY_EN_6, + KEY_EN_Y, + KEY_EN_H, + KEY_EN_B, //40 + KEY_EN_SPACE, + KEY_EN_F6, + KEY_EN_7, + KEY_EN_U, + KEY_EN_J, + KEY_EN_N, + KEY_EN_UNUSED, //space + KEY_EN_F7, + KEY_EN_8, + KEY_EN_I, //50 + KEY_EN_K, + KEY_EN_M, + KEY_EN_UNUSED, //space + KEY_EN_F8, + KEY_EN_9, + KEY_EN_O, + KEY_EN_L, + KEY_EN_COMMA, + KEY_EN_UNUSED, //space + KEY_EN_F9, //60 + KEY_EN_0, + KEY_EN_P, + KEY_EN_SEMICOLON, + KEY_EN_PERIOD, + KEY_EN_RIGHT_ALT, + KEY_EN_F10, + KEY_EN_MINUS, + KEY_EN_LEFT_BRACKET, + KEY_EN_QUOTE, + KEY_EN_FORWARD_SLASH, //70 + KEY_EN_RIGHT_WINDOWS, + KEY_EN_F11, + KEY_EN_EQUALS, + KEY_EN_RIGHT_BRACKET, + KEY_EN_POUND, //iso only + KEY_EN_UNUSED, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_F12, + KEY_EN_BACKSPACE, + KEY_EN_ANSI_BACK_SLASH, //80 + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_SHIFT, + KEY_EN_RIGHT_CONTROL, + KEY_EN_PRINT_SCREEN, + KEY_EN_INSERT, + KEY_EN_DELETE, + KEY_EN_UNUSED, + KEY_EN_UNUSED, + KEY_EN_LEFT_ARROW, + KEY_EN_PAUSE_BREAK, //90 + KEY_EN_HOME, + KEY_EN_END, + KEY_EN_UNUSED, + KEY_EN_UP_ARROW, + KEY_EN_DOWN_ARROW, "Key: Mode", - "Key: Page Up", - "Key: Page Down", - "Unused", - "Key: Scroll Lock", //100 - Scroll lock for WootingTwo KB's - "Key: Right Arrow", + KEY_EN_PAGE_UP, + KEY_EN_PAGE_DOWN, + KEY_EN_UNUSED, + KEY_EN_SCROLL_LOCK, //100 - Scroll lock for WootingTwo KB's + KEY_EN_RIGHT_ARROW, "Key: A1", - "Key: Num Lock", - "Key: Number Pad 7", - "Key: Number Pad 4", - "Key: Number Pad 1", - "Unused", + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_1, + KEY_EN_UNUSED, "Key: A2", - "Key: Number Pad /", - "Key: Number Pad 8", //110 - "Key: Number Pad 5", - "Key: Number Pad 2", - "Key: Number Pad 0", + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_8, //110 + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_0, "Key: A3", - "Key: Number Pad *", - "Key: Number Pad 9", - "Key: Number Pad 6", - "Key: Number Pad 3", - "Key: Number Pad .", + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_6, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_PERIOD, "Key: Mode", //120 - Mode key for WootingTwo KB's - "Key: Number Pad -", - "Key: Number Pad +", - "Unused", - "Key: Number Pad Enter", - "Unused" + KEY_EN_NUMPAD_MINUS, + KEY_EN_NUMPAD_PLUS, + KEY_EN_UNUSED, + KEY_EN_NUMPAD_ENTER, + KEY_EN_UNUSED }; RGBController_WootingKeyboard::RGBController_WootingKeyboard(WootingKeyboardController *wooting_ptr) diff --git a/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp b/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp index 1081aa80..8fccb3c2 100644 --- a/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp +++ b/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp @@ -10,6 +10,7 @@ | Moon_darker (Vaker) 23/01/2022 | \*-----------------------------------------*/ +#include "RGBControllerKeyNames.h" #include "RGBController_ZETBladeOptical.h" //0xFFFFFFFF indicates an unused entry in matrix @@ -42,131 +43,131 @@ static const unsigned int zone_sizes[] = static const char *led_names[] = { - "Key: Escape", + KEY_EN_ESCAPE, // Skip index 1 - "Key: F1", - "Key: F2", - "Key: F3", - "Key: F4", - "Key: F5", - "Key: F6", - "Key: F7", - "Key: F8", - "Key: F9", - "Key: F10", - "Key: F11", - "Key: F12", - "Key: Print Screen", - "Key: Scroll Lock", - "Key: Pause/Break", + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, + KEY_EN_PAUSE_BREAK, // Skip index 17 // Skip index 18 // Skip index 19 // Skip index 20 - "Key: `", - "Key: 1", - "Key: 2", - "Key: 3", - "Key: 4", - "Key: 5", - "Key: 6", - "Key: 7", - "Key: 8", - "Key: 9", - "Key: 0", - "Key: -", - "Key: =", - "Key: Backspace", - "Key: Insert", - "Key: Home", - "Key: Page Up", - "Key: Num Lock", - "Key: Number Pad /", - "Key: Number Pad *", - "Key: Number Pad -", - "Key: Tab", - "Key: Q", - "Key: W", - "Key: E", - "Key: R", - "Key: T", - "Key: Y", - "Key: U", - "Key: I", - "Key: O", - "Key: P", - "Key: [", - "Key: ]", - "Key: \\ (ANSI)", - "Key: Delete", - "Key: End", - "Key: Page Down", - "Key: Number Pad 7", - "Key: Number Pad 8", - "Key: Number Pad 9", - "Key: Number Pad +", - "Key: Caps Lock", - "Key: A", - "Key: S", - "Key: D", - "Key: F", - "Key: G", - "Key: H", - "Key: J", - "Key: K", - "Key: L", - "Key: ;", - "Key: '", + KEY_EN_BACK_TICK, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_BACKSPACE, + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_MINUS, + KEY_EN_TAB, + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_Y, + KEY_EN_U, + KEY_EN_I, + KEY_EN_O, + KEY_EN_P, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_PLUS, + KEY_EN_CAPS_LOCK, + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, // Skip index 75 - "Key: Enter", + KEY_EN_ANSI_ENTER, // Skip index 77 // Skip index 78 // Skip index 79 - "Key: Number Pad 4", - "Key: Number Pad 5", - "Key: Number Pad 6", + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_6, // Skip index 83 - "Key: Left Shift", + KEY_EN_LEFT_SHIFT, // Skip index 85 - "Key: Z", - "Key: X", - "Key: C", - "Key: V", - "Key: B", - "Key: N", - "Key: M", - "Key: ,", - "Key: .", - "Key: /", + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_N, + KEY_EN_M, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, // Skip index 96 - "Key: Right Shift", + KEY_EN_RIGHT_SHIFT, // Skip index 98 - "Key: Up Arrow", + KEY_EN_UP_ARROW, // Skip index 100 - "Key: Number Pad 1", - "Key: Number Pad 2", - "Key: Number Pad 3", - "Key: Number Pad Enter", - "Key: Left Control", - "Key: Left Windows", - "Key: Left Alt", + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_ENTER, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, // Skip index 108 // Skip index 109 - "Key: Space", + KEY_EN_SPACE, // Skip index 111 // Skip index 112 // Skip index 113 - "Key: Right Alt", - "Key: Right Fn", + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_FUNCTION, // Skip index 116 - "Key: Menu", - "Key: Right Control", - "Key: Left Arrow", - "Key: Down Arrow", - "Key: Right Arrow", - "Key: Number Pad 0", + KEY_EN_MENU, + KEY_EN_RIGHT_CONTROL, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_RIGHT_ARROW, + KEY_EN_NUMPAD_0, // Skip index 123 - "Key: Number Pad .", + KEY_EN_NUMPAD_PERIOD, }; RGBController_ZETBladeOptical::RGBController_ZETBladeOptical(ZETBladeOpticalController* controller_ptr) diff --git a/OpenRGB.pro b/OpenRGB.pro index 6f5055a0..4a80d31e 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -508,6 +508,7 @@ HEADERS += RGBController/RGBController.h \ RGBController/RGBController_Dummy.h \ RGBController/RGBController_Network.h \ + RGBController/RGBControllerKeyNames.h \ SOURCES += \ dependencies/Swatches/swatches.cpp \ diff --git a/RGBController/RGBControllerKeyNames.h b/RGBController/RGBControllerKeyNames.h new file mode 100644 index 00000000..5614de6c --- /dev/null +++ b/RGBController/RGBControllerKeyNames.h @@ -0,0 +1,138 @@ +/*-------------------------------------------------------------------*\ +| RGBControllerKeyNames.h | +| | +| This is the canonical list of Key Names to be used in | +| keyboard and other device initialisations to avoid redundant | +| string literal declarations | +| | +| Chris M (Dr_No) 25 Jan 2022 | +| | +\*-------------------------------------------------------------------*/ + +#pragma once + +static const char *KEY_EN_UNUSED = ""; + +static const char *KEY_EN_ESCAPE = "Key: Escape"; +static const char *KEY_EN_F1 = "Key: F1"; +static const char *KEY_EN_F2 = "Key: F2"; +static const char *KEY_EN_F3 = "Key: F3"; +static const char *KEY_EN_F4 = "Key: F4"; +static const char *KEY_EN_F5 = "Key: F5"; +static const char *KEY_EN_F6 = "Key: F6"; +static const char *KEY_EN_F7 = "Key: F7"; +static const char *KEY_EN_F8 = "Key: F8"; +static const char *KEY_EN_F9 = "Key: F9"; +static const char *KEY_EN_F10 = "Key: F10"; +static const char *KEY_EN_F11 = "Key: F11"; +static const char *KEY_EN_F12 = "Key: F12"; +static const char *KEY_EN_PRINT_SCREEN = "Key: Print Screen"; +static const char *KEY_EN_SCROLL_LOCK = "Key: Scroll Lock"; +static const char *KEY_EN_PAUSE_BREAK = "Key: Pause/Break"; + +static const char *KEY_EN_BACK_TICK = "Key: `"; +static const char *KEY_EN_1 = "Key: 1"; +static const char *KEY_EN_2 = "Key: 2"; +static const char *KEY_EN_3 = "Key: 3"; +static const char *KEY_EN_4 = "Key: 4"; +static const char *KEY_EN_5 = "Key: 5"; +static const char *KEY_EN_6 = "Key: 6"; +static const char *KEY_EN_7 = "Key: 7"; +static const char *KEY_EN_8 = "Key: 8"; +static const char *KEY_EN_9 = "Key: 9"; +static const char *KEY_EN_0 = "Key: 0"; +static const char *KEY_EN_MINUS = "Key: -"; +static const char *KEY_EN_EQUALS = "Key: ="; +static const char *KEY_EN_BACKSPACE = "Key: Backspace"; +static const char *KEY_EN_INSERT = "Key: Insert"; +static const char *KEY_EN_HOME = "Key: Home"; +static const char *KEY_EN_PAGE_UP = "Key: Page Up"; + +static const char *KEY_EN_TAB = "Key: TAB"; +static const char *KEY_EN_Q = "Key: Q"; +static const char *KEY_EN_W = "Key: W"; +static const char *KEY_EN_E = "Key: E"; +static const char *KEY_EN_R = "Key: R"; +static const char *KEY_EN_T = "Key: T"; +static const char *KEY_EN_Y = "Key: Y"; +static const char *KEY_EN_U = "Key: U"; +static const char *KEY_EN_I = "Key: I"; +static const char *KEY_EN_O = "Key: O"; +static const char *KEY_EN_P = "Key: P"; +static const char *KEY_EN_LEFT_BRACKET = "Key: ["; +static const char *KEY_EN_RIGHT_BRACKET = "Key: ]"; +static const char *KEY_EN_ANSI_BACK_SLASH = "Key: \\ (ANSI)"; +static const char *KEY_EN_DELETE = "Key: Delete"; +static const char *KEY_EN_END = "Key: End"; +static const char *KEY_EN_PAGE_DOWN = "Key: Page Down"; + +static const char *KEY_EN_CAPS_LOCK = "Key: Caps Lock"; +static const char *KEY_EN_A = "Key: A"; +static const char *KEY_EN_S = "Key: S"; +static const char *KEY_EN_D = "Key: D"; +static const char *KEY_EN_F = "Key: F"; +static const char *KEY_EN_G = "Key: G"; +static const char *KEY_EN_H = "Key: H"; +static const char *KEY_EN_J = "Key: J"; +static const char *KEY_EN_K = "Key: K"; +static const char *KEY_EN_L = "Key: L"; +static const char *KEY_EN_SEMICOLON = "Key: ;"; +static const char *KEY_EN_QUOTE = "Key: '"; +static const char *KEY_EN_POUND = "Key: #"; +static const char *KEY_EN_ANSI_ENTER = "Key: Enter"; +static const char *KEY_EN_ISO_ENTER = "Key: Enter (ISO)"; + +static const char *KEY_EN_LEFT_SHIFT = "Key: Left Shift"; +static const char *KEY_EN_ISO_BACK_SLASH = "Key: \\ (ISO)"; +static const char *KEY_EN_Z = "Key: Z"; +static const char *KEY_EN_X = "Key: X"; +static const char *KEY_EN_C = "Key: C"; +static const char *KEY_EN_V = "Key: V"; +static const char *KEY_EN_B = "Key: B"; +static const char *KEY_EN_N = "Key: N"; +static const char *KEY_EN_M = "Key: M"; +static const char *KEY_EN_COMMA = "Key: ,"; +static const char *KEY_EN_PERIOD = "Key: ."; +static const char *KEY_EN_FORWARD_SLASH = "Key: /"; +static const char *KEY_EN_RIGHT_SHIFT = "Key: Right Shift"; +static const char *KEY_EN_UP_ARROW = "Key: Up Arrow"; + +static const char *KEY_EN_LEFT_CONTROL = "Key: Left Control"; +static const char *KEY_EN_LEFT_WINDOWS = "Key: Left Windows"; +static const char *KEY_EN_LEFT_FUNCTION = "Key: Left Fn"; +static const char *KEY_EN_LEFT_ALT = "Key: Left Alt"; +static const char *KEY_EN_SPACE = "Key: Space"; +static const char *KEY_EN_RIGHT_ALT = "Key: Right Alt"; +static const char *KEY_EN_RIGHT_FUNCTION = "Key: Right Fn"; +static const char *KEY_EN_RIGHT_WINDOWS = "Key: Right Windows"; +static const char *KEY_EN_MENU = "Key: Menu"; +static const char *KEY_EN_RIGHT_CONTROL = "Key: Right Control"; +static const char *KEY_EN_LEFT_ARROW = "Key: Left Arrow"; +static const char *KEY_EN_DOWN_ARROW = "Key: Down Arrow"; +static const char *KEY_EN_RIGHT_ARROW = "Key: Right Arrow"; + +static const char *KEY_EN_NUMPAD_LOCK = "Key: Num Lock"; +static const char *KEY_EN_NUMPAD_DIVIDE = "Key: Number Pad /"; +static const char *KEY_EN_NUMPAD_TIMES = "Key: Number Pad *"; +static const char *KEY_EN_NUMPAD_MINUS = "Key: Number Pad -"; +static const char *KEY_EN_NUMPAD_PLUS = "Key: Number Pad +"; +static const char *KEY_EN_NUMPAD_PERIOD = "Key: Number Pad ."; +static const char *KEY_EN_NUMPAD_ENTER = "Key: Number Pad Enter"; +static const char *KEY_EN_NUMPAD_0 = "Key: Number Pad 0"; +static const char *KEY_EN_NUMPAD_1 = "Key: Number Pad 1"; +static const char *KEY_EN_NUMPAD_2 = "Key: Number Pad 2"; +static const char *KEY_EN_NUMPAD_3 = "Key: Number Pad 3"; +static const char *KEY_EN_NUMPAD_4 = "Key: Number Pad 4"; +static const char *KEY_EN_NUMPAD_5 = "Key: Number Pad 5"; +static const char *KEY_EN_NUMPAD_6 = "Key: Number Pad 6"; +static const char *KEY_EN_NUMPAD_7 = "Key: Number Pad 7"; +static const char *KEY_EN_NUMPAD_8 = "Key: Number Pad 8"; +static const char *KEY_EN_NUMPAD_9 = "Key: Number Pad 9"; + +static const char *KEY_EN_MEDIA_PLAY_PAUSE = "Key: Media Play/Pause"; +static const char *KEY_EN_MEDIA_PREVIOUS = "Key: Media Previous"; +static const char *KEY_EN_MEDIA_NEXT = "Key: Media Next"; +static const char *KEY_EN_MEDIA_STOP = "Key: Media Stop"; +static const char *KEY_EN_MEDIA_MUTE = "Key: Media Mute"; +static const char *KEY_EN_MEDIA_VOLUME_DOWN = "Key: Media Volume -"; +static const char *KEY_EN_MEDIA_VOLUME_UP = "Key: Media Volume +"; diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp index 0d4cfb17..1af0f526 100644 --- a/qt/DeviceView.cpp +++ b/qt/DeviceView.cpp @@ -7,6 +7,7 @@ \*-----------------------------------------------------*/ #include "DeviceView.h" +#include "RGBControllerKeyNames.h" #include "RGBController.h" #include #include @@ -36,122 +37,122 @@ struct led_label static const std::map led_label_lookup = { - { "Key: A", { "A" , "A", }}, - { "Key: B", { "B" , "B", }}, - { "Key: C", { "C" , "C", }}, - { "Key: D", { "D" , "D", }}, - { "Key: E", { "E" , "E", }}, - { "Key: F", { "F" , "F", }}, - { "Key: G", { "G" , "G", }}, - { "Key: H", { "H" , "H", }}, - { "Key: I", { "I" , "I", }}, - { "Key: J", { "J" , "J", }}, - { "Key: K", { "K" , "K", }}, - { "Key: L", { "L" , "L", }}, - { "Key: M", { "M" , "M", }}, - { "Key: N", { "N" , "N", }}, - { "Key: O", { "O" , "O", }}, - { "Key: P", { "P" , "P", }}, - { "Key: Q", { "Q" , "Q", }}, - { "Key: R", { "R" , "R", }}, - { "Key: S", { "S" , "S", }}, - { "Key: T", { "T" , "T", }}, - { "Key: U", { "U" , "U", }}, - { "Key: V", { "V" , "V", }}, - { "Key: W", { "W" , "W", }}, - { "Key: X", { "X" , "X", }}, - { "Key: Y", { "Y" , "Y", }}, - { "Key: Z", { "Z" , "Z", }}, - { "Key: 0", { "0" , "0", }}, - { "Key: 1", { "1" , "1", }}, - { "Key: 2", { "2" , "2", }}, - { "Key: 3", { "3" , "3", }}, - { "Key: 4", { "4" , "4", }}, - { "Key: 5", { "5" , "5", }}, - { "Key: 6", { "6" , "6", }}, - { "Key: 7", { "7" , "7", }}, - { "Key: 8", { "8" , "8", }}, - { "Key: 9", { "9" , "9", }}, - { "Key: F1", { "F1" , "F1", }}, - { "Key: F2", { "F2" , "F2", }}, - { "Key: F3", { "F3" , "F3", }}, - { "Key: F4", { "F4" , "F4", }}, - { "Key: F5", { "F5" , "F5", }}, - { "Key: F6", { "F6" , "F6", }}, - { "Key: F7", { "F7" , "F7", }}, - { "Key: F8", { "F8" , "F8", }}, - { "Key: F9", { "F9" , "F9", }}, - { "Key: F10", { "F10" , "F10", }}, - { "Key: F11", { "F11" , "F11", }}, - { "Key: F12", { "F12" , "F12", }}, - { "Key: `", { "`" , "`", }}, - { "Key: -", { "-" , "-", }}, - { "Key: =", { "=" , "=", }}, - { "Key: [", { "[" , "[", }}, - { "Key: ]", { "]" , "]", }}, - { "Key: \\ (ANSI)", { "\\" , "\\", }}, - { "Key: \\ (ISO)", { "\\" , "\\", }}, - { "Key: ;", { ";" , ";", }}, - { "Key: '", { "'" , "'", }}, - { "Key: #", { "#" , "#", }}, - { "Key: ,", { "," , ",", }}, - { "Key: .", { "." , ".", }}, - { "Key: /", { "/" , "/", }}, - { "Key: Escape", { "Esc" , "Esc", }}, - { "Key: Print Screen", { "Prt" , "Prt", }}, - { "Key: Scroll Lock", { "Scr" , "Scr", }}, - { "Key: Pause/Break", { "Brk" , "Brk", }}, - { "Key: Backspace", { "Bks" , "\xE2\x8C\xAB" }}, // ⌫ - { "Key: Insert", { "Ins" , "Ins", }}, - { "Key: Home", { "Hom" , "Hom", }}, - { "Key: Page Up", { "PUp" , "PUp", }}, - { "Key: Tab", { "Tab" , "\xE2\x86\xb9" }}, // ⭾ ↹ ⇄ ⇥ - { "Key: Delete", { "Del" , "Del", }}, - { "Key: End", { "End" , "End", }}, - { "Key: Page Down", { "PDn" , "PDn", }}, - { "Key: Caps Lock", { "Cap" , "Cap", }}, - { "Key: Enter", { "Ent" , "\xE2\x86\xB5" }}, // ↵ ⏎ - { "Key: Enter (ISO)", { "Ent" , "\xE2\x86\xB5" }}, // ↵ ⏎ - { "Key: Left Shift", { "Sft" , "\xE2\x87\xA7" }}, // ⇧ - { "Key: Right Shift", { "Sft" , "\xE2\x87\xA7" }}, // ⇧ - { "Key: Up Arrow", { "Up" , "\xF0\x9F\xA1\xB9" }}, // ↑ 🡹 - { "Key: Left Control", { "Ctl" , "Ctl", }}, - { "Key: Left Windows", { "Win" , "\xe2\x9d\x96" }}, // ❖ - { "Key: Left Fn", { "Fn" , "Fn", }}, - { "Key: Left Alt", { "Alt" , "Alt", }}, - { "Key: Space", { "Spc" , "Spc", }}, - { "Key: Right Alt", { "Alt" , "Alt", }}, - { "Key: Right Fn", { "Fn" , "Fn", }}, - { "Key: Right Windows", { "Win" , "\xe2\x9d\x96" }}, // ❖ - { "Key: Menu", { "Mnu" , "\xE2\x98\xB0" }}, // ▤ ☰ 𝌆 🗏 - { "Key: Right Control", { "Ctl" , "Ctl", }}, - { "Key: Left Arrow", { "Lft" , "\xF0\x9F\xA1\xB8" }}, // ↑ 🡹 - { "Key: Down Arrow", { "Dn" , "\xF0\x9F\xA1\xBB" }}, // ↑ 🡹 - { "Key: Right Arrow", { "Rgt" , "\xF0\x9F\xA1\xBA" }}, // ↑ 🡹 - { "Key: Num Lock", { "Num" , "Num", }}, - { "Key: Number Pad /", { "/" , "/", }}, - { "Key: Number Pad *", { "*" , "*", }}, - { "Key: Number Pad -", { "-" , "-", }}, - { "Key: Number Pad +", { "+" , "+", }}, - { "Key: Number Pad .", { "." , ".", }}, - { "Key: Number Pad Enter", { "Ent" , "\xE2\x86\xB5" }}, // ↵ ⏎ - { "Key: Number Pad 0", { "0" , "0", }}, - { "Key: Number Pad 1", { "1" , "1", }}, - { "Key: Number Pad 2", { "2" , "2", }}, - { "Key: Number Pad 3", { "3" , "3", }}, - { "Key: Number Pad 4", { "4" , "4", }}, - { "Key: Number Pad 5", { "5" , "5", }}, - { "Key: Number Pad 6", { "6" , "6", }}, - { "Key: Number Pad 7", { "7" , "7", }}, - { "Key: Number Pad 8", { "8" , "8", }}, - { "Key: Number Pad 9", { "9" , "9", }}, - { "Key: Media Play/Pause", { "Ply" , "\xE2\x8F\xAF" ,}}, // ⏯ - { "Key: Media Previous", { "Prv" , "\xE2\x8F\xAE" ,}}, // ⏮ - { "Key: Media Next", { "Nxt" , "\xE2\x8F\xAD" ,}}, // ⏭ - { "Key: Media Stop", { "Stp" , "\xE2\x8F\xB9" ,}}, // ⏹ - { "Key: Media Mute", { "Mte" , "\xF0\x9F\x94\x87",}}, // 🔇 - { "Key: Media Volume -", { "Vl-" , "\xF0\x9F\x94\x88",}}, // 🔉 - { "Key: Media Volume +", { "Vl+" , "\xF0\x9F\x94\x89",}}, // 🔊 + { KEY_EN_A, { "A" , "A", }}, + { KEY_EN_B, { "B" , "B", }}, + { KEY_EN_C, { "C" , "C", }}, + { KEY_EN_D, { "D" , "D", }}, + { KEY_EN_E, { "E" , "E", }}, + { KEY_EN_F, { "F" , "F", }}, + { KEY_EN_G, { "G" , "G", }}, + { KEY_EN_H, { "H" , "H", }}, + { KEY_EN_I, { "I" , "I", }}, + { KEY_EN_J, { "J" , "J", }}, + { KEY_EN_K, { "K" , "K", }}, + { KEY_EN_L, { "L" , "L", }}, + { KEY_EN_M, { "M" , "M", }}, + { KEY_EN_N, { "N" , "N", }}, + { KEY_EN_O, { "O" , "O", }}, + { KEY_EN_P, { "P" , "P", }}, + { KEY_EN_Q, { "Q" , "Q", }}, + { KEY_EN_R, { "R" , "R", }}, + { KEY_EN_S, { "S" , "S", }}, + { KEY_EN_T, { "T" , "T", }}, + { KEY_EN_U, { "U" , "U", }}, + { KEY_EN_V, { "V" , "V", }}, + { KEY_EN_W, { "W" , "W", }}, + { KEY_EN_X, { "X" , "X", }}, + { KEY_EN_Y, { "Y" , "Y", }}, + { KEY_EN_Z, { "Z" , "Z", }}, + { KEY_EN_0, { "0" , "0", }}, + { KEY_EN_1, { "1" , "1", }}, + { KEY_EN_2, { "2" , "2", }}, + { KEY_EN_3, { "3" , "3", }}, + { KEY_EN_4, { "4" , "4", }}, + { KEY_EN_5, { "5" , "5", }}, + { KEY_EN_6, { "6" , "6", }}, + { KEY_EN_7, { "7" , "7", }}, + { KEY_EN_8, { "8" , "8", }}, + { KEY_EN_9, { "9" , "9", }}, + { KEY_EN_F1, { "F1" , "F1", }}, + { KEY_EN_F2, { "F2" , "F2", }}, + { KEY_EN_F3, { "F3" , "F3", }}, + { KEY_EN_F4, { "F4" , "F4", }}, + { KEY_EN_F5, { "F5" , "F5", }}, + { KEY_EN_F6, { "F6" , "F6", }}, + { KEY_EN_F7, { "F7" , "F7", }}, + { KEY_EN_F8, { "F8" , "F8", }}, + { KEY_EN_F9, { "F9" , "F9", }}, + { KEY_EN_F10, { "F10" , "F10", }}, + { KEY_EN_F11, { "F11" , "F11", }}, + { KEY_EN_F12, { "F12" , "F12", }}, + { KEY_EN_BACK_TICK, { "`" , "`", }}, + { KEY_EN_MINUS, { "-" , "-", }}, + { KEY_EN_EQUALS, { "=" , "=", }}, + { KEY_EN_LEFT_BRACKET, { "[" , "[", }}, + { KEY_EN_RIGHT_BRACKET, { "]" , "]", }}, + { KEY_EN_ANSI_BACK_SLASH, { "\\" , "\\", }}, + { KEY_EN_ISO_BACK_SLASH, { "\\" , "\\", }}, + { KEY_EN_SEMICOLON, { ";" , ";", }}, + { KEY_EN_QUOTE, { "'" , "'", }}, + { KEY_EN_POUND, { "#" , "#", }}, + { KEY_EN_COMMA, { "," , ",", }}, + { KEY_EN_PERIOD, { "." , ".", }}, + { KEY_EN_FORWARD_SLASH, { "/" , "/", }}, + { KEY_EN_ESCAPE, { "Esc" , "Esc", }}, + { KEY_EN_PRINT_SCREEN, { "Prt" , "Prt", }}, + { KEY_EN_SCROLL_LOCK, { "Scr" , "Scr", }}, + { KEY_EN_PAUSE_BREAK, { "Brk" , "Brk", }}, + { KEY_EN_BACKSPACE, { "Bks" , "\xE2\x8C\xAB" }}, // ⌫ + { KEY_EN_INSERT, { "Ins" , "Ins", }}, + { KEY_EN_HOME, { "Hom" , "Hom", }}, + { KEY_EN_PAGE_UP, { "PUp" , "PUp", }}, + { KEY_EN_TAB, { "Tab" , "\xE2\x86\xb9" }}, // ⭾ ↹ ⇄ ⇥ + { KEY_EN_DELETE, { "Del" , "Del", }}, + { KEY_EN_END, { "End" , "End", }}, + { KEY_EN_PAGE_DOWN, { "PDn" , "PDn", }}, + { KEY_EN_CAPS_LOCK, { "Cap" , "Cap", }}, + { KEY_EN_ANSI_ENTER, { "Ent" , "\xE2\x86\xB5" }}, // ↵ ⏎ + { KEY_EN_ISO_ENTER, { "Ent" , "\xE2\x86\xB5" }}, // ↵ ⏎ + { KEY_EN_LEFT_SHIFT, { "Sft" , "\xE2\x87\xA7" }}, // ⇧ + { KEY_EN_RIGHT_SHIFT, { "Sft" , "\xE2\x87\xA7" }}, // ⇧ + { KEY_EN_UP_ARROW, { "Up" , "\xF0\x9F\xA1\xB9" }}, // ↑ 🡹 + { KEY_EN_LEFT_CONTROL, { "Ctl" , "Ctl", }}, + { KEY_EN_LEFT_WINDOWS, { "Win" , "\xe2\x9d\x96" }}, // ❖ + { KEY_EN_LEFT_FUNCTION, { "Fn" , "Fn", }}, + { KEY_EN_LEFT_ALT, { "Alt" , "Alt", }}, + { KEY_EN_SPACE, { "Spc" , "Spc", }}, + { KEY_EN_RIGHT_ALT, { "Alt" , "Alt", }}, + { KEY_EN_RIGHT_FUNCTION, { "Fn" , "Fn", }}, + { KEY_EN_RIGHT_WINDOWS, { "Win" , "\xe2\x9d\x96" }}, // ❖ + { KEY_EN_MENU, { "Mnu" , "\xE2\x98\xB0" }}, // ▤ ☰ 𝌆 🗏 + { KEY_EN_RIGHT_CONTROL, { "Ctl" , "Ctl", }}, + { KEY_EN_LEFT_ARROW, { "Lft" , "\xF0\x9F\xA1\xB8" }}, // ↑ 🡹 + { KEY_EN_DOWN_ARROW, { "Dn" , "\xF0\x9F\xA1\xBB" }}, // ↑ 🡹 + { KEY_EN_RIGHT_ARROW, { "Rgt" , "\xF0\x9F\xA1\xBA" }}, // ↑ 🡹 + { KEY_EN_NUMPAD_LOCK, { "Num" , "Num", }}, + { KEY_EN_NUMPAD_DIVIDE, { "/" , "/", }}, + { KEY_EN_NUMPAD_TIMES, { "*" , "*", }}, + { KEY_EN_NUMPAD_MINUS, { "-" , "-", }}, + { KEY_EN_NUMPAD_PLUS, { "+" , "+", }}, + { KEY_EN_NUMPAD_PERIOD, { "." , ".", }}, + { KEY_EN_NUMPAD_ENTER, { "Ent" , "\xE2\x86\xB5" }}, // ↵ ⏎ + { KEY_EN_NUMPAD_0, { "0" , "0", }}, + { KEY_EN_NUMPAD_1, { "1" , "1", }}, + { KEY_EN_NUMPAD_2, { "2" , "2", }}, + { KEY_EN_NUMPAD_3, { "3" , "3", }}, + { KEY_EN_NUMPAD_4, { "4" , "4", }}, + { KEY_EN_NUMPAD_5, { "5" , "5", }}, + { KEY_EN_NUMPAD_6, { "6" , "6", }}, + { KEY_EN_NUMPAD_7, { "7" , "7", }}, + { KEY_EN_NUMPAD_8, { "8" , "8", }}, + { KEY_EN_NUMPAD_9, { "9" , "9", }}, + { KEY_EN_MEDIA_PLAY_PAUSE, { "Ply" , "\xE2\x8F\xAF", }}, // ⏯ + { KEY_EN_MEDIA_PREVIOUS, { "Prv" , "\xE2\x8F\xAE", }}, // ⏮ + { KEY_EN_MEDIA_NEXT, { "Nxt" , "\xE2\x8F\xAD", }}, // ⏭ + { KEY_EN_MEDIA_STOP, { "Stp" , "\xE2\x8F\xB9", }}, // ⏹ + { KEY_EN_MEDIA_MUTE, { "Mte" , "\xF0\x9F\x94\x87", }}, // 🔇 + { KEY_EN_MEDIA_VOLUME_DOWN, { "Vl-" , "\xF0\x9F\x94\x88", }}, // 🔉 + { KEY_EN_MEDIA_VOLUME_UP, { "Vl+" , "\xF0\x9F\x94\x89", }}, // 🔊 }; void DeviceView::setController(RGBController * controller_ptr) @@ -260,18 +261,18 @@ void DeviceView::setController(RGBController * controller_ptr) \*-----------------------------------------------------*/ if(led_x < map->width - 1 && map->map[map_idx + 1] == 0xFFFFFFFF) { - if( ( controller->leds[color_idx].name == "Key: Tab" ) - || ( controller->leds[color_idx].name == "Key: Caps Lock" ) - || ( controller->leds[color_idx].name == "Key: Left Shift" ) - || ( controller->leds[color_idx].name == "Key: Right Shift" ) - || ( controller->leds[color_idx].name == "Key: Backspace" ) - || ( controller->leds[color_idx].name == "Key: Number Pad 0" ) ) + if( ( controller->leds[color_idx].name == KEY_EN_TAB ) + || ( controller->leds[color_idx].name == KEY_EN_CAPS_LOCK ) + || ( controller->leds[color_idx].name == KEY_EN_LEFT_SHIFT ) + || ( controller->leds[color_idx].name == KEY_EN_RIGHT_SHIFT) + || ( controller->leds[color_idx].name == KEY_EN_BACKSPACE ) + || ( controller->leds[color_idx].name == KEY_EN_NUMPAD_0 ) ) { led_pos[color_idx].matrix_w += atom; } } - if( ( controller->leds[color_idx].name == "Key: Number Pad Enter" ) - || ( controller->leds[color_idx].name == "Key: Number Pad +" ) ) + if( ( controller->leds[color_idx].name == KEY_EN_NUMPAD_ENTER ) + || ( controller->leds[color_idx].name == KEY_EN_NUMPAD_PLUS ) ) { if(led_y < map->height - 1 && map->map[map_idx + map->width] == 0xFFFFFFFF) { @@ -284,7 +285,7 @@ void DeviceView::setController(RGBController * controller_ptr) led_pos[color_idx].matrix_h += atom; } } - else if(controller->leds[color_idx].name == "Key: Space") + else if(controller->leds[color_idx].name == KEY_EN_SPACE) { for(unsigned int map_idx2 = map_idx - 1; map_idx2 > led_y * map->width && map->map[map_idx2] == 0xFFFFFFFF; --map_idx2) {