From 8adfcacfa9183e79b19836c5a6a55110f36ee15a Mon Sep 17 00:00:00 2001 From: NicoHood Date: Fri, 23 Oct 2015 20:50:47 +0200 Subject: [PATCH] Updated Keyboard definitions once again --- src/HID-APIs/HID-Tables.h | 225 ---------------------------- src/HID-APIs/ImprovedKeylayouts.h | 241 +++++++++++++++++++++++++++++- src/HID-APIs/KeyboardAPI.h | 1 - 3 files changed, 233 insertions(+), 234 deletions(-) diff --git a/src/HID-APIs/HID-Tables.h b/src/HID-APIs/HID-Tables.h index bc56d52..b62be3a 100644 --- a/src/HID-APIs/HID-Tables.h +++ b/src/HID-APIs/HID-Tables.h @@ -63,231 +63,6 @@ #define HID_SYSTEM_DISPLAY_SWAP_PRIMARY_SLASH_SECONDARY 0xB6 // HID type OSC #define HID_SYSTEM_DISPLAY_LCD_AUTOSCALE 0xB7 // HID type OSC -// Keyboard HID mappings - -// Reserved (no_event_indicated) 0x00 -#define HID_KEYBOARD_ERROR_ROLLOVER 0x01 -#define HID_KEYBOARD_POST_FAIL 0x02 -#define HID_KEYBOARD_ERROR_UNDEFINED 0x03 -#define HID_KEYBOARD_A_AND_A 0x04 -#define HID_KEYBOARD_B_AND_B 0x05 -#define HID_KEYBOARD_C_AND_C 0x06 -#define HID_KEYBOARD_D_AND_D 0x07 -#define HID_KEYBOARD_E_AND_E 0x08 -#define HID_KEYBOARD_F_AND_F 0x09 -#define HID_KEYBOARD_G_AND_G 0x0A -#define HID_KEYBOARD_H_AND_H 0x0B -#define HID_KEYBOARD_I_AND_I 0x0C -#define HID_KEYBOARD_J_AND_J 0x0D -#define HID_KEYBOARD_K_AND_K 0x0E -#define HID_KEYBOARD_L_AND_L 0x0F -#define HID_KEYBOARD_M_AND_M 0x10 -#define HID_KEYBOARD_N_AND_N 0x11 -#define HID_KEYBOARD_O_AND_O 0x12 -#define HID_KEYBOARD_P_AND_P 0x13 -#define HID_KEYBOARD_Q_AND_Q 0x14 -#define HID_KEYBOARD_R_AND_R 0x15 -#define HID_KEYBOARD_S_AND_S 0x16 -#define HID_KEYBOARD_T_AND_T 0x17 -#define HID_KEYBOARD_U_AND_U 0x18 -#define HID_KEYBOARD_V_AND_V 0x19 -#define HID_KEYBOARD_W_AND_W 0x1A -#define HID_KEYBOARD_X_AND_X 0x1B -#define HID_KEYBOARD_Y_AND_Y 0x1C -#define HID_KEYBOARD_Z_AND_Z 0x1D -#define HID_KEYBOARD_1_AND_EXCLAMATION_POINT 0x1E -#define HID_KEYBOARD_2_AND_AT 0x1F -#define HID_KEYBOARD_3_AND_POUND 0x20 -#define HID_KEYBOARD_4_AND_DOLLAR 0x21 -#define HID_KEYBOARD_5_AND_PERCENT 0x22 -#define HID_KEYBOARD_6_AND_CARAT 0x23 -#define HID_KEYBOARD_7_AND_AMPERSAND 0x24 -#define HID_KEYBOARD_8_AND_ASTERISK 0x25 -#define HID_KEYBOARD_9_AND_LEFT_PAREN 0x26 -#define HID_KEYBOARD_0_AND_RIGHT_PAREN 0x27 -#define HID_KEYBOARD_ENTER 0x28 // (MARKED AS ENTER_SLASH_RETURN) -#define HID_KEYBOARD_ESCAPE 0x29 -#define HID_KEYBOARD_DELETE 0x2A // (BACKSPACE) -#define HID_KEYBOARD_TAB 0x2B -#define HID_KEYBOARD_SPACEBAR 0x2C -#define HID_KEYBOARD_MINUS_AND_UNDERSCORE 0x2D // (UNDERSCORE) -#define HID_KEYBOARD_EQUALS_AND_PLUS 0x2E -#define HID_KEYBOARD_LEFT_BRACKET_AND_LEFT_CURLY_BRACE 0x2F -#define HID_KEYBOARD_RIGHT_BRACKET_AND_RIGHT_CURLY_BRACE 0x30 -#define HID_KEYBOARD_BACKSLASH_AND_PIPE 0x31 -#define HID_KEYBOARD_NON_US_POUND_AND_TILDE 0x32 -#define HID_KEYBOARD_SEMICOLON_AND_COLON 0x33 -#define HID_KEYBOARD_QUOTE_AND_DOUBLEQUOTE 0x34 -#define HID_KEYBOARD_GRAVE_ACCENT_AND_TILDE 0x35 -#define HID_KEYBOARD_COMMA_AND_LESS_THAN 0x36 -#define HID_KEYBOARD_PERIOD_AND_GREATER_THAN 0x37 -#define HID_KEYBOARD_SLASH_AND_QUESTION_MARK 0x38 -#define HID_KEYBOARD_CAPS_LOCK 0x39 -#define HID_KEYBOARD_F1 0x3A -#define HID_KEYBOARD_F2 0x3B -#define HID_KEYBOARD_F3 0x3C -#define HID_KEYBOARD_F4 0x3D -#define HID_KEYBOARD_F5 0x3E -#define HID_KEYBOARD_F6 0x3F -#define HID_KEYBOARD_F7 0x40 -#define HID_KEYBOARD_F8 0x41 -#define HID_KEYBOARD_F9 0x42 -#define HID_KEYBOARD_F10 0x43 -#define HID_KEYBOARD_F11 0x44 -#define HID_KEYBOARD_F12 0x45 -#define HID_KEYBOARD_PRINTSCREEN 0x46 -#define HID_KEYBOARD_SCROLL_LOCK 0x47 -#define HID_KEYBOARD_PAUSE 0x48 -#define HID_KEYBOARD_INSERT 0x49 -#define HID_KEYBOARD_HOME 0x4A -#define HID_KEYBOARD_PAGE_UP 0x4B -#define HID_KEYBOARD_DELETE_FORWARD 0x4C -#define HID_KEYBOARD_END 0x4D -#define HID_KEYBOARD_PAGE_DOWN 0x4E -#define HID_KEYBOARD_RIGHTARROW 0x4F -#define HID_KEYBOARD_LEFTARROW 0x50 -#define HID_KEYBOARD_DOWNARROW 0x51 -#define HID_KEYBOARD_UPARROW 0x52 -#define HID_KEYPAD_NUM_LOCK_AND_CLEAR 0x53 -#define HID_KEYPAD_DIVIDE 0x54 -#define HID_KEYPAD_MULTIPLY 0x55 -#define HID_KEYPAD_SUBTRACT 0x56 -#define HID_KEYPAD_ADD 0x57 -#define HID_KEYPAD_ENTER 0x58 -#define HID_KEYPAD_1_AND_END 0x59 -#define HID_KEYPAD_2_AND_DOWN_ARROW 0x5A -#define HID_KEYPAD_3_AND_PAGE_DOWN 0x5B -#define HID_KEYPAD_4_AND_LEFT_ARROW 0x5C -#define HID_KEYPAD_5 0x5D -#define HID_KEYPAD_6_AND_RIGHT_ARROW 0x5E -#define HID_KEYPAD_7_AND_HOME 0x5F -#define HID_KEYPAD_8_AND_UP_ARROW 0x60 -#define HID_KEYPAD_9_AND_PAGE_UP 0x61 -#define HID_KEYPAD_0_AND_INSERT 0x62 -#define HID_KEYPAD_PERIOD_AND_DELETE 0x63 -#define HID_KEYBOARD_NON_US_BACKSLASH_AND_PIPE 0x64 -#define HID_KEYBOARD_APPLICATION 0x65 -#define HID_KEYBOARD_POWER 0x66 -#define HID_KEYPAD_EQUALS 0x67 -#define HID_KEYBOARD_F13 0x68 -#define HID_KEYBOARD_F14 0x69 -#define HID_KEYBOARD_F15 0x6A -#define HID_KEYBOARD_F16 0x6B -#define HID_KEYBOARD_F17 0x6C -#define HID_KEYBOARD_F18 0x6D -#define HID_KEYBOARD_F19 0x6E -#define HID_KEYBOARD_F20 0x6F -#define HID_KEYBOARD_F21 0x70 -#define HID_KEYBOARD_F22 0x71 -#define HID_KEYBOARD_F23 0x72 -#define HID_KEYBOARD_F24 0x73 -#define HID_KEYBOARD_EXECUTE 0x74 -#define HID_KEYBOARD_HELP 0x75 -#define HID_KEYBOARD_MENU 0x76 -#define HID_KEYBOARD_SELECT 0x77 -#define HID_KEYBOARD_STOP 0x78 -#define HID_KEYBOARD_AGAIN 0x79 -#define HID_KEYBOARD_UNDO 0x7A -#define HID_KEYBOARD_CUT 0x7B -#define HID_KEYBOARD_COPY 0x7C -#define HID_KEYBOARD_PASTE 0x7D -#define HID_KEYBOARD_FIND 0x7E -#define HID_KEYBOARD_MUTE 0x7F -#define HID_KEYBOARD_VOLUME_UP 0x80 -#define HID_KEYBOARD_VOLUME_DOWN 0x81 -#define HID_KEYBOARD_LOCKING_CAPS_LOCK 0x82 -#define HID_KEYBOARD_LOCKING_NUM_LOCK 0x83 -#define HID_KEYBOARD_LOCKING_SCROLL_LOCK 0x84 -#define HID_KEYPAD_COMMA 0x85 -#define HID_KEYPAD_EQUAL_SIGN 0x86 -#define HID_KEYBOARD_INTERNATIONAL1 0x87 -#define HID_KEYBOARD_INTERNATIONAL2 0x88 -#define HID_KEYBOARD_INTERNATIONAL3 0x89 -#define HID_KEYBOARD_INTERNATIONAL4 0x8A -#define HID_KEYBOARD_INTERNATIONAL5 0x8B -#define HID_KEYBOARD_INTERNATIONAL6 0x8C -#define HID_KEYBOARD_INTERNATIONAL7 0x8D -#define HID_KEYBOARD_INTERNATIONAL8 0x8E -#define HID_KEYBOARD_INTERNATIONAL9 0x8F -#define HID_KEYBOARD_LANG1 0x90 -#define HID_KEYBOARD_LANG2 0x91 -#define HID_KEYBOARD_LANG3 0x92 -#define HID_KEYBOARD_LANG4 0x93 -#define HID_KEYBOARD_LANG5 0x94 -#define HID_KEYBOARD_LANG6 0x95 -#define HID_KEYBOARD_LANG7 0x96 -#define HID_KEYBOARD_LANG8 0x97 -#define HID_KEYBOARD_LANG9 0x98 -#define HID_KEYBOARD_ALTERNATE_ERASE 0x99 -#define HID_KEYBOARD_SYSREQ_SLASH_ATTENTION 0x9A -#define HID_KEYBOARD_CANCEL 0x9B -#define HID_KEYBOARD_CLEAR 0x9C -#define HID_KEYBOARD_PRIOR 0x9D -#define HID_KEYBOARD_RETURN 0x9E -#define HID_KEYBOARD_SEPARATOR 0x9F -#define HID_KEYBOARD_OUT 0xA0 -#define HID_KEYBOARD_OPER 0xA1 -#define HID_KEYBOARD_CLEAR_SLASH_AGAIN 0xA2 -#define HID_KEYBOARD_CRSEL_SLASH_PROPS 0xA3 -#define HID_KEYBOARD_EXSEL 0xA4 -// Reserved 0xA5-AF -#define HID_KEYPAD_00 0xB0 -#define HID_KEYPAD_000 0xB1 -#define HID_THOUSANDS_SEPARATOR 0xB2 -#define HID_DECIMAL_SEPARATOR 0xB3 -#define HID_CURRENCY_UNIT 0xB4 -#define HID_CURRENCY_SUBUNIT 0xB5 -#define HID_KEYPAD_LEFT_PAREN 0xB6 -#define HID_KEYPAD_RIGHT_PAREN 0xB7 -#define HID_KEYPAD_LEFT_CURLY_BRACE 0xB8 -#define HID_KEYPAD_RIGHT_CURLY_BRACE 0xB9 -#define HID_KEYPAD_TAB 0xBA -#define HID_KEYPAD_BACKSPACE 0xBB -#define HID_KEYPAD_A 0xBC -#define HID_KEYPAD_B 0xBD -#define HID_KEYPAD_C 0xBE -#define HID_KEYPAD_D 0xBF -#define HID_KEYPAD_E 0xC0 -#define HID_KEYPAD_F 0xC1 -#define HID_KEYPAD_XOR 0xC2 -#define HID_KEYPAD_CARAT 0xC3 -#define HID_KEYPAD_PERCENT 0xC4 -#define HID_KEYPAD_LESS_THAN 0xC5 -#define HID_KEYPAD_GREATER_THAN 0xC6 -#define HID_KEYPAD_AMPERSAND 0xC7 -#define HID_KEYPAD_DOUBLEAMPERSAND 0xC8 -#define HID_KEYPAD_PIPE 0xC9 -#define HID_KEYPAD_DOUBLEPIPE 0xCA -#define HID_KEYPAD_COLON 0xCB -#define HID_KEYPAD_POUND_SIGN 0xCC -#define HID_KEYPAD_SPACE 0xCD -#define HID_KEYPAD_AT_SIGN 0xCE -#define HID_KEYPAD_EXCLAMATION_POINT 0xCF -#define HID_KEYPAD_MEMORY_STORE 0xD0 -#define HID_KEYPAD_MEMORY_RECALL 0xD1 -#define HID_KEYPAD_MEMORY_CLEAR 0xD2 -#define HID_KEYPAD_MEMORY_ADD 0xD3 -#define HID_KEYPAD_MEMORY_SUBTRACT 0xD4 -#define HID_KEYPAD_MEMORY_MULTIPLY 0xD5 -#define HID_KEYPAD_MEMORY_DIVIDE 0xD6 -#define HID_KEYPAD_PLUS_SLASH_MINUS 0xD7 -#define HID_KEYPAD_CLEAR 0xD8 -#define HID_KEYPAD_CLEAR_ENTRY 0xD9 -#define HID_KEYPAD_BINARY 0xDA -#define HID_KEYPAD_OCTAL 0xDB -#define HID_KEYPAD_DECIMAL 0xDC -#define HID_KEYPAD_HEXADECIMAL 0xDD - -// 0xDE-0xDF - RESERVED -#define HID_KEYBOARD_LEFT_CONTROL 0xE0 -#define HID_KEYBOARD_LEFT_SHIFT 0xE1 -#define HID_KEYBOARD_LEFT_ALT 0xE2 -#define HID_KEYBOARD_LEFT_GUI 0xE3 -#define HID_KEYBOARD_RIGHT_CONTROL 0xE4 -#define HID_KEYBOARD_RIGHT_SHIFT 0xE5 -#define HID_KEYBOARD_RIGHT_ALT 0xE6 -#define HID_KEYBOARD_RIGHT_GUI 0xE7 - // Consumer_Page_(0x0C) 0x15 #define HID_CONSUMER_NUMERIC_KEY_PAD 0x02 // HID type NARY diff --git a/src/HID-APIs/ImprovedKeylayouts.h b/src/HID-APIs/ImprovedKeylayouts.h index 894c379..7645ec8 100644 --- a/src/HID-APIs/ImprovedKeylayouts.h +++ b/src/HID-APIs/ImprovedKeylayouts.h @@ -44,9 +44,9 @@ enum KeyboardModifier : uint8_t { enum KeyboardKeycode : uint8_t { KEY_RESERVED = 0, - KEY_ERRORROLLOVER = 1, - KEY_POSTFAIL = 2, - KEY_ERRORUNDEFINED = 3, + KEY_ERROR_ROLLOVER = 1, + KEY_POST_FAIL = 2, + KEY_ERROR_UNDEFINED = 3, KEY_A = 4, KEY_B = 5, KEY_C = 6, @@ -128,10 +128,10 @@ enum KeyboardKeycode : uint8_t { KEY_DOWN_ARROW = 0x51, KEY_UP_ARROW = 0x52, KEY_NUM_LOCK = 0x53, - KEYPAD_SLASH = 0x54, - KEYPAD_ASTERICS = 0x55, - KEYPAD_MINUS = 0x56, - KEYPAD_PLUS = 0x57, + KEYPAD_DIVIDE = 0x54, + KEYPAD_MULTIPLY = 0x55, + KEYPAD_SUBTRACT = 0x56, + KEYPAD_ADD = 0x57, KEYPAD_ENTER = 0x59, KEYPAD_1 = 0x59, KEYPAD_2 = 0x5A, @@ -150,7 +150,7 @@ enum KeyboardKeycode : uint8_t { // Most of the following keys will only work with Linux or not at all. // F13+ keys are mostly used for laptop functions like ECO key. KEY_POWER = 0x66, - KEY_PAD_EQUAL = 0x67, + KEY_PAD_EQUALS = 0x67, // Dont confuse with KEYPAD_EQUAL_SIGN KEY_F13 = 0x68, KEY_F14 = 0x69, KEY_F15 = 0x6A, @@ -270,6 +270,231 @@ enum KeyboardKeycode : uint8_t { //KEY_RIGHT_SHIFT = 0xE5, //KEY_RIGHT_ALT = 0xE6, //KEY_RIGHT_GUI = 0xE7, + + // Keyboard HID mappings + + // Reserved (no_event_indicated) + HID_KEYBOARD_ERROR_ROLLOVER = 0x01, + HID_KEYBOARD_POST_FAIL = 0x02, + HID_KEYBOARD_ERROR_UNDEFINED = 0x03, + HID_KEYBOARD_A_AND_A = 0x04, + HID_KEYBOARD_B_AND_B = 0x05, + HID_KEYBOARD_C_AND_C = 0x06, + HID_KEYBOARD_D_AND_D = 0x07, + HID_KEYBOARD_E_AND_E = 0x08, + HID_KEYBOARD_F_AND_F = 0x09, + HID_KEYBOARD_G_AND_G = 0x0A, + HID_KEYBOARD_H_AND_H = 0x0B, + HID_KEYBOARD_I_AND_I = 0x0C, + HID_KEYBOARD_J_AND_J = 0x0D, + HID_KEYBOARD_K_AND_K = 0x0E, + HID_KEYBOARD_L_AND_L = 0x0F, + HID_KEYBOARD_M_AND_M = 0x10, + HID_KEYBOARD_N_AND_N = 0x11, + HID_KEYBOARD_O_AND_O = 0x12, + HID_KEYBOARD_P_AND_P = 0x13, + HID_KEYBOARD_Q_AND_Q = 0x14, + HID_KEYBOARD_R_AND_R = 0x15, + HID_KEYBOARD_S_AND_S = 0x16, + HID_KEYBOARD_T_AND_T = 0x17, + HID_KEYBOARD_U_AND_U = 0x18, + HID_KEYBOARD_V_AND_V = 0x19, + HID_KEYBOARD_W_AND_W = 0x1A, + HID_KEYBOARD_X_AND_X = 0x1B, + HID_KEYBOARD_Y_AND_Y = 0x1C, + HID_KEYBOARD_Z_AND_Z = 0x1D, + HID_KEYBOARD_1_AND_EXCLAMATION_POINT = 0x1E, + HID_KEYBOARD_2_AND_AT = 0x1F, + HID_KEYBOARD_3_AND_POUND = 0x20, + HID_KEYBOARD_4_AND_DOLLAR = 0x21, + HID_KEYBOARD_5_AND_PERCENT = 0x22, + HID_KEYBOARD_6_AND_CARAT = 0x23, + HID_KEYBOARD_7_AND_AMPERSAND = 0x24, + HID_KEYBOARD_8_AND_ASTERISK = 0x25, + HID_KEYBOARD_9_AND_LEFT_PAREN = 0x26, + HID_KEYBOARD_0_AND_RIGHT_PAREN = 0x27, + HID_KEYBOARD_ENTER = 0x28, // (MARKED AS ENTER_SLASH_RETURN) + HID_KEYBOARD_ESCAPE = 0x29, + HID_KEYBOARD_DELETE = 0x2A, // (BACKSPACE) + HID_KEYBOARD_TAB = 0x2B, + HID_KEYBOARD_SPACEBAR = 0x2C, + HID_KEYBOARD_MINUS_AND_UNDERSCORE = 0x2D, // (UNDERSCORE) + HID_KEYBOARD_EQUALS_AND_PLUS = 0x2E, + HID_KEYBOARD_LEFT_BRACKET_AND_LEFT_CURLY_BRACE = 0x2F, + HID_KEYBOARD_RIGHT_BRACKET_AND_RIGHT_CURLY_BRACE = 0x30, + HID_KEYBOARD_BACKSLASH_AND_PIPE = 0x31, + HID_KEYBOARD_NON_US_POUND_AND_TILDE = 0x32, + HID_KEYBOARD_SEMICOLON_AND_COLON = 0x33, + HID_KEYBOARD_QUOTE_AND_DOUBLEQUOTE = 0x34, + HID_KEYBOARD_GRAVE_ACCENT_AND_TILDE = 0x35, + HID_KEYBOARD_COMMA_AND_LESS_THAN = 0x36, + HID_KEYBOARD_PERIOD_AND_GREATER_THAN = 0x37, + HID_KEYBOARD_SLASH_AND_QUESTION_MARK = 0x38, + HID_KEYBOARD_CAPS_LOCK = 0x39, + HID_KEYBOARD_F1 = 0x3A, + HID_KEYBOARD_F2 = 0x3B, + HID_KEYBOARD_F3 = 0x3C, + HID_KEYBOARD_F4 = 0x3D, + HID_KEYBOARD_F5 = 0x3E, + HID_KEYBOARD_F6 = 0x3F, + HID_KEYBOARD_F7 = 0x40, + HID_KEYBOARD_F8 = 0x41, + HID_KEYBOARD_F9 = 0x42, + HID_KEYBOARD_F10 = 0x43, + HID_KEYBOARD_F11 = 0x44, + HID_KEYBOARD_F12 = 0x45, + HID_KEYBOARD_PRINTSCREEN = 0x46, + HID_KEYBOARD_SCROLL_LOCK = 0x47, + HID_KEYBOARD_PAUSE = 0x48, + HID_KEYBOARD_INSERT = 0x49, + HID_KEYBOARD_HOME = 0x4A, + HID_KEYBOARD_PAGE_UP = 0x4B, + HID_KEYBOARD_DELETE_FORWARD = 0x4C, + HID_KEYBOARD_END = 0x4D, + HID_KEYBOARD_PAGE_DOWN = 0x4E, + HID_KEYBOARD_RIGHTARROW = 0x4F, + HID_KEYBOARD_LEFTARROW = 0x50, + HID_KEYBOARD_DOWNARROW = 0x51, + HID_KEYBOARD_UPARROW = 0x52, + HID_KEYPAD_NUM_LOCK_AND_CLEAR = 0x53, + HID_KEYPAD_DIVIDE = 0x54, + HID_KEYPAD_MULTIPLY = 0x55, + HID_KEYPAD_SUBTRACT = 0x56, + HID_KEYPAD_ADD = 0x57, + HID_KEYPAD_ENTER = 0x58, + HID_KEYPAD_1_AND_END = 0x59, + HID_KEYPAD_2_AND_DOWN_ARROW = 0x5A, + HID_KEYPAD_3_AND_PAGE_DOWN = 0x5B, + HID_KEYPAD_4_AND_LEFT_ARROW = 0x5C, + HID_KEYPAD_5 = 0x5D, + HID_KEYPAD_6_AND_RIGHT_ARROW = 0x5E, + HID_KEYPAD_7_AND_HOME = 0x5F, + HID_KEYPAD_8_AND_UP_ARROW = 0x60, + HID_KEYPAD_9_AND_PAGE_UP = 0x61, + HID_KEYPAD_0_AND_INSERT = 0x62, + HID_KEYPAD_PERIOD_AND_DELETE = 0x63, + HID_KEYBOARD_NON_US_BACKSLASH_AND_PIPE = 0x64, + HID_KEYBOARD_APPLICATION = 0x65, + HID_KEYBOARD_POWER = 0x66, + HID_KEYPAD_EQUALS = 0x67, + HID_KEYBOARD_F13 = 0x68, + HID_KEYBOARD_F14 = 0x69, + HID_KEYBOARD_F15 = 0x6A, + HID_KEYBOARD_F16 = 0x6B, + HID_KEYBOARD_F17 = 0x6C, + HID_KEYBOARD_F18 = 0x6D, + HID_KEYBOARD_F19 = 0x6E, + HID_KEYBOARD_F20 = 0x6F, + HID_KEYBOARD_F21 = 0x70, + HID_KEYBOARD_F22 = 0x71, + HID_KEYBOARD_F23 = 0x72, + HID_KEYBOARD_F24 = 0x73, + HID_KEYBOARD_EXECUTE = 0x74, + HID_KEYBOARD_HELP = 0x75, + HID_KEYBOARD_MENU = 0x76, + HID_KEYBOARD_SELECT = 0x77, + HID_KEYBOARD_STOP = 0x78, + HID_KEYBOARD_AGAIN = 0x79, + HID_KEYBOARD_UNDO = 0x7A, + HID_KEYBOARD_CUT = 0x7B, + HID_KEYBOARD_COPY = 0x7C, + HID_KEYBOARD_PASTE = 0x7D, + HID_KEYBOARD_FIND = 0x7E, + HID_KEYBOARD_MUTE = 0x7F, + HID_KEYBOARD_VOLUME_UP = 0x80, + HID_KEYBOARD_VOLUME_DOWN = 0x81, + HID_KEYBOARD_LOCKING_CAPS_LOCK = 0x82, + HID_KEYBOARD_LOCKING_NUM_LOCK = 0x83, + HID_KEYBOARD_LOCKING_SCROLL_LOCK = 0x84, + HID_KEYPAD_COMMA = 0x85, + HID_KEYPAD_EQUAL_SIGN = 0x86, + HID_KEYBOARD_INTERNATIONAL1 = 0x87, + HID_KEYBOARD_INTERNATIONAL2 = 0x88, + HID_KEYBOARD_INTERNATIONAL3 = 0x89, + HID_KEYBOARD_INTERNATIONAL4 = 0x8A, + HID_KEYBOARD_INTERNATIONAL5 = 0x8B, + HID_KEYBOARD_INTERNATIONAL6 = 0x8C, + HID_KEYBOARD_INTERNATIONAL7 = 0x8D, + HID_KEYBOARD_INTERNATIONAL8 = 0x8E, + HID_KEYBOARD_INTERNATIONAL9 = 0x8F, + HID_KEYBOARD_LANG1 = 0x90, + HID_KEYBOARD_LANG2 = 0x91, + HID_KEYBOARD_LANG3 = 0x92, + HID_KEYBOARD_LANG4 = 0x93, + HID_KEYBOARD_LANG5 = 0x94, + HID_KEYBOARD_LANG6 = 0x95, + HID_KEYBOARD_LANG7 = 0x96, + HID_KEYBOARD_LANG8 = 0x97, + HID_KEYBOARD_LANG9 = 0x98, + HID_KEYBOARD_ALTERNATE_ERASE = 0x99, + HID_KEYBOARD_SYSREQ_SLASH_ATTENTION = 0x9A, + HID_KEYBOARD_CANCEL = 0x9B, + HID_KEYBOARD_CLEAR = 0x9C, + HID_KEYBOARD_PRIOR = 0x9D, + HID_KEYBOARD_RETURN = 0x9E, + HID_KEYBOARD_SEPARATOR = 0x9F, + HID_KEYBOARD_OUT = 0xA0, + HID_KEYBOARD_OPER = 0xA1, + HID_KEYBOARD_CLEAR_SLASH_AGAIN = 0xA2, + HID_KEYBOARD_CRSEL_SLASH_PROPS = 0xA3, + HID_KEYBOARD_EXSEL = 0xA4, + // Reserved 0xA5-AF + HID_KEYPAD_00 = 0xB0, + HID_KEYPAD_000 = 0xB1, + HID_THOUSANDS_SEPARATOR = 0xB2, + HID_DECIMAL_SEPARATOR = 0xB3, + HID_CURRENCY_UNIT = 0xB4, + HID_CURRENCY_SUBUNIT = 0xB5, + HID_KEYPAD_LEFT_PAREN = 0xB6, + HID_KEYPAD_RIGHT_PAREN = 0xB7, + HID_KEYPAD_LEFT_CURLY_BRACE = 0xB8, + HID_KEYPAD_RIGHT_CURLY_BRACE = 0xB9, + HID_KEYPAD_TAB = 0xBA, + HID_KEYPAD_BACKSPACE = 0xBB, + HID_KEYPAD_A = 0xBC, + HID_KEYPAD_B = 0xBD, + HID_KEYPAD_C = 0xBE, + HID_KEYPAD_D = 0xBF, + HID_KEYPAD_E = 0xC0, + HID_KEYPAD_F = 0xC1, + HID_KEYPAD_XOR = 0xC2, + HID_KEYPAD_CARAT = 0xC3, + HID_KEYPAD_PERCENT = 0xC4, + HID_KEYPAD_LESS_THAN = 0xC5, + HID_KEYPAD_GREATER_THAN = 0xC6, + HID_KEYPAD_AMPERSAND = 0xC7, + HID_KEYPAD_DOUBLEAMPERSAND = 0xC8, + HID_KEYPAD_PIPE = 0xC9, + HID_KEYPAD_DOUBLEPIPE = 0xCA, + HID_KEYPAD_COLON = 0xCB, + HID_KEYPAD_POUND_SIGN = 0xCC, + HID_KEYPAD_SPACE = 0xCD, + HID_KEYPAD_AT_SIGN = 0xCE, + HID_KEYPAD_EXCLAMATION_POINT = 0xCF, + HID_KEYPAD_MEMORY_STORE = 0xD0, + HID_KEYPAD_MEMORY_RECALL = 0xD1, + HID_KEYPAD_MEMORY_CLEAR = 0xD2, + HID_KEYPAD_MEMORY_ADD = 0xD3, + HID_KEYPAD_MEMORY_SUBTRACT = 0xD4, + HID_KEYPAD_MEMORY_MULTIPLY = 0xD5, + HID_KEYPAD_MEMORY_DIVIDE = 0xD6, + HID_KEYPAD_PLUS_SLASH_MINUS = 0xD7, + HID_KEYPAD_CLEAR = 0xD8, + HID_KEYPAD_CLEAR_ENTRY = 0xD9, + HID_KEYPAD_BINARY = 0xDA, + HID_KEYPAD_OCTAL = 0xDB, + HID_KEYPAD_DECIMAL = 0xDC, + HID_KEYPAD_HEXADECIMAL = 0xDD, + + // 0xDE-0xDF - RESERVED + HID_KEYBOARD_LEFT_CONTROL = 0xE0, + HID_KEYBOARD_LEFT_SHIFT = 0xE1, + HID_KEYBOARD_LEFT_ALT = 0xE2, + HID_KEYBOARD_LEFT_GUI = 0xE3, + HID_KEYBOARD_RIGHT_CONTROL = 0xE4, + HID_KEYBOARD_RIGHT_SHIFT = 0xE5, + HID_KEYBOARD_RIGHT_ALT = 0xE6, + HID_KEYBOARD_RIGHT_GUI = 0xE7, }; // Keyboard Leds diff --git a/src/HID-APIs/KeyboardAPI.h b/src/HID-APIs/KeyboardAPI.h index 707a056..f646984 100644 --- a/src/HID-APIs/KeyboardAPI.h +++ b/src/HID-APIs/KeyboardAPI.h @@ -27,7 +27,6 @@ THE SOFTWARE. #include #include "HID-Settings.h" #include "ImprovedKeylayouts.h" -#include "HID-Tables.h" //TODO typedef union{ // Low level key report: up to 6 keys and shift, ctrl etc at once