From c4442ab0314d2c69cef44f839fa20560fe8dd239 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sun, 16 Oct 2022 20:56:22 +0200 Subject: [PATCH] Added combo key support --- firmware/src/main.cpp | 324 +++++++++++++++++++++++++++--------------- 1 file changed, 207 insertions(+), 117 deletions(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index a4a1dd3..10f8f2c 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -29,23 +29,47 @@ * Keyboard/Mouse based on standard teensy "Keypad" library for button scanning, standard teensy * "usb_keyboard" library for HID keyboard/mouse usb data communication. * - * --------------------------------------------------------------------------------------------- - * | Tab/Fn2 | Q | W | E | R | T | | Y | U | I | O | P | Å | - * | Ctrl/Esc | A | S | D | F | G | | H | J | K | L | Ö | Ä | - * | Shift/Del | Z | X | C | V | B | | N | M | , | . | - | Shift/Enter | - * -----------------| M1/M2 | Alt | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- - * -------------------------- ------------------------- + * Layer 0 + * ------------------------------------------ --------------------------------------------- + * | Tab/Fn2 | Q | W | E | R | T | | Y | U | I | O | P | Å | + * | Ctrl/Esc | A | S | D | F | G | | H | J | K | L | Ö | Ä | + * | Shift | Z | X | C | V | B | | N | M | , | . | - | Shift/Enter | + * ----------------| M1/M2 | Alt | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- + * -------------------------- ------------------------- + * Layer 1 + * ------------------------------------------ --------------------------------------------- + * | Tab/Fn2 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | Ctrl/Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + | + * | Shift | § | Del | Esc | < | | | | ' | ¨ | ´ | | Shift/Enter | + * ----------------| M1/M2 | Alt | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- + * -------------------------- ------------------------- + * Layer 2 + * ------------------------------------------ --------------------------------------------- + * | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | | CapsLock | + * | Ctrl/Esc | Prev| Play| Next| | | | Left| Down| Up |Right| | | + * | Shift | | | | | | | Home| PgD | PgU | End | Ins | Shift/Enter | + * ----------------| M1/M2 | Alt | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- + * -------------------------- ------------------------- + * Game mode + * ------------------------------------------ --------------------------------------------- + * | Tab | | | | | | | | | | | | | + * | Ctrl | | | | | | | | | | | | | + * | | | | | | | | | | | | | | + * ----------------| Alt | Spc | | | | | |-------------------- + * -------------------------- ------------------------- + * * Features: * - * * 42 keys "Split" keyboard layout. 36 finger keys and 6 thumb keys. - * * Function buttons with total of four key-layer support (Primary + 2fn layers + Game mode). + * * 42 keys "Split" keyboard layout. 36 finger buttons and 6 thumb buttons. + * * Function keys with total of four layer support (Primary + 2fn layers + Game mode). * * Mouse movement, wheel up, wheel down, left button, right button and middle button support * * Status indication - * - 0 LED off = Normal mode * - 1 LED constant on = Game mode * - 2 LED flashing = Caps Lock activated - * * Game mode: Replaces all layer keys with a "Game mode KEY". Configurable for each key - * + * * Game mode: Replaces all layer keys with a "Game mode KEY". Configurable for each button + * * Tap/Hold functionality (only for layer0) + * * Combo key (up to three simultaneous keys) support. Configurable for each button */ #include @@ -57,18 +81,19 @@ #define KEY_OFFSET 0xAA00 // Offset to apply for not interfere with already defined keyboard keys -#define KEY_MWU 1 + KEY_OFFSET // Mouse wheel up -#define KEY_MWD 2 + KEY_OFFSET // Mouse wheel down -#define KEY_M1 3 + KEY_OFFSET // Mouse button 1 (left) -#define KEY_M2 4 + KEY_OFFSET // Mouse button 2 (right) -#define KEY_M3 5 + KEY_OFFSET // Mouse button 3 (middle/wheel) -#define KEY_MU 6 + KEY_OFFSET // Mouse Y+ -#define KEY_ML 7 + KEY_OFFSET // Mouse X- -#define KEY_MD 8 + KEY_OFFSET // Mouse Y- -#define KEY_MR 9 + KEY_OFFSET // Mouse X+ -#define KEY_FN1 10 + KEY_OFFSET // Function layer 1 button -#define KEY_FN2 11 + KEY_OFFSET // Function layer 2 button -#define KEY_GM 12 + KEY_OFFSET // Toggle game mode button +#define KEY_MWU 1 + KEY_OFFSET // Mouse wheel up +#define KEY_MWD 2 + KEY_OFFSET // Mouse wheel down +#define KEY_M1 3 + KEY_OFFSET // Mouse button 1 (left) +#define KEY_M2 4 + KEY_OFFSET // Mouse button 2 (right) +#define KEY_M3 5 + KEY_OFFSET // Mouse button 3 (middle/wheel) +#define KEY_MU 6 + KEY_OFFSET // Mouse Y+ +#define KEY_ML 7 + KEY_OFFSET // Mouse X- +#define KEY_MD 8 + KEY_OFFSET // Mouse Y- +#define KEY_MR 9 + KEY_OFFSET // Mouse X+ +#define KEY_FN1 10 + KEY_OFFSET // Function layer 1 button +#define KEY_FN2 11 + KEY_OFFSET // Function layer 2 button +#define KEY_GM 12 + KEY_OFFSET // Toggle game mode button +#define KEY_COMBO 13 + KEY_OFFSET // Combo key (pressing all key defined in combo array) #define TAP_TIMEOUT 160 // Key tap timeout (ms) #define NBR_OF_BUTTONS 21 // Number of buttons used (42 in this case) @@ -81,8 +106,8 @@ struct Button uint16_t fn1_keycode = NO_KEY; uint16_t fn2_keycode = NO_KEY; uint16_t gm_keycode = NO_KEY; - bool tap_enable = false; bool hold_direct = true; + uint16_t combo_keycode[3] = {NO_KEY, NO_KEY, NO_KEY}; int kstate = IDLE; bool run_keycode = false; int tap_state = 0; @@ -108,93 +133,102 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, Button buttons[NBR_OF_BUTTONS] = { - {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, - {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {7, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, - {8, KEY_A, NO_KEY, KEY_1, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {9, KEY_S, NO_KEY, KEY_2, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {10, KEY_D, NO_KEY, KEY_3, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {11, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {12, KEY_G, NO_KEY, KEY_5, KEY_CAPS_LOCK, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {13, KEY_LEFT_SHIFT, KEY_DELETE, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, - {14, KEY_Z, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {15, KEY_X, NO_KEY, KEY_ML, KEY_MEDIA_PLAY_PAUSE, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {16, KEY_C, NO_KEY, KEY_MD, KEY_MEDIA_NEXT_TRACK, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {17, KEY_V, NO_KEY, KEY_MU, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {18, KEY_B, NO_KEY, KEY_MR, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {19, KEY_GM, NO_KEY, KEY_6, KEY_LEFT_ARROW, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, - {20, KEY_LEFT_ALT, KEY_SPACE, NO_KEY, NO_KEY, KEY_SPACE, true, false, IDLE, false, 0, false, false, 0, 0, false}, - {21, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}}; + {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {7, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {8, KEY_A, NO_KEY, KEY_1, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {9, KEY_S, NO_KEY, KEY_2, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {10, KEY_D, NO_KEY, KEY_3, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {11, KEY_F, NO_KEY, KEY_MWU, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {12, KEY_G, NO_KEY, KEY_MWD, KEY_CAPS_LOCK, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {13, KEY_LEFT_SHIFT, KEY_DELETE, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {14, KEY_Z, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {15, KEY_X, NO_KEY, KEY_ML, KEY_MEDIA_PLAY_PAUSE, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {16, KEY_C, NO_KEY, KEY_MD, KEY_MEDIA_NEXT_TRACK, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {17, KEY_V, NO_KEY, KEY_MU, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {18, KEY_B, NO_KEY, KEY_MR, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {19, KEY_COMBO, NO_KEY, KEY_COMBO, KEY_LEFT_ARROW, NO_KEY, true, {KEY_LEFT_CTRL, KEY_LEFT_ALT, KEY_F1}, IDLE, false, 0, false, false, 0, 0, false}, + {20, KEY_LEFT_ALT, KEY_SPACE, NO_KEY, NO_KEY, KEY_SPACE, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {21, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}}; // const byte KP_ROWS = 4; // const byte KP_COLS = 12; // byte kp_rowPins[KP_ROWS] = {1, 2, 3, 4}; // byte kp_colPins[KP_COLS] = {12, 11, 10, 9, 8, 7, 26, 25, 24, 23, 22, 21}; - -// // @formatter:off -// /* Keymap config ----------------------------------------------------------------------------------------------------------------------------------------------------- -// Key ID corresponding with the physical design of the actual keyboard. */ // char kp_keys[KP_ROWS][KP_COLS] = { // {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, 30, 31, 32, 33, 34, 35, 36}, // {0, 0, 0, 37, 38, 39, 40, 41, 42, 0, 0, 0}}; - // Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, KP_COLS); + +// // @formatter:off +// /* Keymap config ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- // /* Valid "Fn0 (hold) key" when using tap mode are: KEY_LEFT_SHIFT, KEY_RIGHT_SHIFT, KEY_LEFT_CTRL, KEY_RIGHT_CTRL, KEY_RIGHT_ALT, KEY_LEFT_GUI, KEY_RIGHT_GUI, KEY_FN1, KEY_FN2 -// Fn1 and Fn2 keys are N/A when using tap mode and should me defined as NO_KEY. -// "GM replace key" will override all layer keys (Fn0, Fn1, Fn2) both tap and hold while game mode are active. -// #Hold direct#* flag is to enable sending PRESS command as soon as the hold key is pressed (regardless if you intend to press the tap key). */ +// * "Button ID" corresponding with the physical design of the actual keyboard. DO NOT CHANGE BTN ID! +// ------------------------------------- ------------------------------------- +// | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 1O | 11 | 12 | +// | 13 | 14 | 15 | 16 | 17 | 18 | | 19 | 20 | 21 | 22 | 23 | 24 | +// | 25 | 26 | 27 | 28 | 29 | 30 | | 31 | 32 | 33 | 34 | 35 | 36 | +// ------------------| 37 | 38 | 39 | | 40 | 41 | 42 |------------------ +// ------------------- ------------------- +// * "Fn0 hold key" is normal key in non tap mode. In tap mode this key is the hold key. +// * "Fn1 key" is the layer 1 key to use. Don NOT add KEY_FN1 or KEY_FN2 to this layer. +// * "Fn2 key" is the layer 2 key to use. Don NOT add KEY_FN1 or KEY_FN2 to this layer. +// "Fn1 key" and "Fn2 key" are N/A when using tap mode and should me defined as NO_KEY. +// * "GM replace key" will override all layer keys (Fn0, Fn1, Fn2) both tap and hold while game mode are active. +// * "Hold direct" enables sending PRESS command as soon as the hold key is pressed (regardless if you intend to press the tap key). +// * "Combo keys" defines up to three keys pressed together when key KEY_COMBO used. If Fn1/2 is used in combo it must be placed in the first position od the array */ // Button buttons[NBR_OF_BUTTONS] = -// { -// /* key ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key GM replace key tap enable hold direct */ -// {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, -// {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {8, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {9, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {10, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {11, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {13, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, -// {14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {15, KEY_S, NO_KEY, KEY_2, KEY_MEDIA_PLAY_PAUSE, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {16, KEY_D, NO_KEY, KEY_3, KEY_MEDIA_NEXT_TRACK, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {17, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {18, KEY_G, NO_KEY, KEY_5, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {19, KEY_H, NO_KEY, KEY_6, KEY_LEFT_ARROW, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {20, KEY_J, NO_KEY, KEY_7, KEY_DOWN_ARROW, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {21, KEY_K, NO_KEY, KEY_8, KEY_UP_ARROW, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {22, KEY_L, NO_KEY, KEY_9, KEY_RIGHT_ARROW, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {23, 'ö', NO_KEY, KEY_0, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {24, 'ä', NO_KEY, KEY_EQUAL, KEY_GM, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {25, KEY_LEFT_SHIFT, KEY_DELETE, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, -// {26, KEY_Z, NO_KEY, '§', NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {27, KEY_X, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {28, KEY_C, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {29, KEY_V, NO_KEY, '<', NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {30, KEY_B, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {31, KEY_N, NO_KEY, NO_KEY, KEY_HOME, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {32, KEY_M, NO_KEY, KEY_BACKSLASH, KEY_PAGE_DOWN, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {33, KEY_COMMA, NO_KEY, KEY_RIGHT_BRACE, KEY_PAGE_UP, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {34, KEY_PERIOD, NO_KEY, KEY_MINUS, KEY_END, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {35, KEY_SLASH, NO_KEY, NO_KEY, KEY_INSERT, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {36, KEY_RIGHT_SHIFT, KEY_ENTER, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, -// {37, KEY_M1, KEY_M2, NO_KEY, NO_KEY, KEY_LEFT_ALT, true, false, IDLE, false, 0, false, false, 0, 0, false}, -// {38, KEY_LEFT_ALT, KEY_SPACE, NO_KEY, NO_KEY, KEY_SPACE, true, false, IDLE, false, 0, false, false, 0, 0, false}, -// {39, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, -// {40, KEY_FN1, KEY_SPACE, NO_KEY, NO_KEY, NO_KEY, true, true, IDLE, false, 0, false, false, 0, 0, false}, -// {41, KEY_RIGHT_ALT, NO_KEY, KEY_RIGHT_ALT, KEY_RIGHT_ALT, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}, -// {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, KEY_LEFT_GUI, NO_KEY, false, false, IDLE, false, 0, false, false, 0, 0, false}}; -// /* ------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ +// { +// /* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key GM replace key Hold direct Combo keys */ +// {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, KEY_TAB, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {8, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {9, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {10, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {11, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {13, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, KEY_LEFT_CTRL, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {15, KEY_S, NO_KEY, KEY_2, KEY_MEDIA_PLAY_PAUSE, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {16, KEY_D, NO_KEY, KEY_3, KEY_MEDIA_NEXT_TRACK, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {17, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {18, KEY_G, NO_KEY, KEY_5, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {19, KEY_H, NO_KEY, KEY_6, KEY_LEFT_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {20, KEY_J, NO_KEY, KEY_7, KEY_DOWN_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {21, KEY_K, NO_KEY, KEY_8, KEY_UP_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {22, KEY_L, NO_KEY, KEY_9, KEY_RIGHT_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {23, 'ö', NO_KEY, KEY_0, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {24, 'ä', NO_KEY, KEY_EQUAL, KEY_GM, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {25, KEY_LEFT_SHIFT, NO_KEY, KEY_LEFT_SHIFT, KEY_LEFT_SHIFT, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {26, KEY_Z, NO_KEY, '§', NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {27, KEY_X, NO_KEY, KEY_DELETE, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {28, KEY_C, NO_KEY, KEY_ESC, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {29, KEY_V, NO_KEY, '<', NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {30, KEY_B, NO_KEY, KEY_ESC, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {31, KEY_N, NO_KEY, NO_KEY, KEY_HOME, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {32, KEY_M, NO_KEY, KEY_BACKSLASH, KEY_PAGE_DOWN, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {33, KEY_COMMA, NO_KEY, KEY_RIGHT_BRACE, KEY_PAGE_UP, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {34, KEY_PERIOD, NO_KEY, KEY_MINUS, KEY_END, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {35, KEY_SLASH, NO_KEY, NO_KEY, KEY_INSERT, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {36, KEY_RIGHT_SHIFT, KEY_ENTER, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {37, KEY_M1, KEY_M2, NO_KEY, NO_KEY, KEY_LEFT_ALT, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {38, KEY_LEFT_ALT, NO_KEY, KEY_LEFT_ALT, KEY_LEFT_ALT, KEY_SPACE, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {39, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {40, KEY_FN1, KEY_SPACE, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {41, KEY_COMBO, NO_KEY, KEY_COMBO, KEY_COMBO, NO_KEY, false, {KEY_FN1, KEY_RIGHT_ALT, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, +// {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, KEY_LEFT_GUI, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}}; +// /* ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ */ // // @formatter:on const int STATUS_LED = 13; @@ -223,7 +257,7 @@ bool key_pressed = false; bool set_key(uint16_t keycode, uint8_t kstate) { /* Abort if keycode is invalid */ - if (keycode == NO_KEY || keycode == KEY_FN1 || keycode == KEY_FN2) + if (keycode == NO_KEY || keycode == KEY_FN1 || keycode == KEY_FN2 || keycode == KEY_COMBO) { return false; } @@ -273,19 +307,19 @@ bool set_key(uint16_t keycode, uint8_t kstate) { if (keycode == KEY_MU) { - mouse_y = 1; + mouse_y = -10; } else if (keycode == KEY_MD) { - mouse_y = -1; + mouse_y = 10; } else if (keycode == KEY_MR) { - mouse_x = 1; + mouse_x = 10; } else if (keycode == KEY_ML) { - mouse_x = -1; + mouse_x = -10; } } } @@ -366,11 +400,11 @@ void scan_buttons() { if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar) { - if (buttons[j].keycode == KEY_FN1 && buttons[j].tap_state != 3) + if ((buttons[j].keycode == KEY_FN1 || (buttons[j].keycode == KEY_COMBO && buttons[j].combo_keycode[0] == KEY_FN1)) && buttons[j].tap_state != 3) { fn_mode = 1; } - else if (buttons[j].keycode == KEY_FN2 && buttons[j].tap_state != 3) + else if ((buttons[j].keycode == KEY_FN2 || (buttons[j].keycode == KEY_COMBO && buttons[j].combo_keycode[0] == KEY_FN2)) && buttons[j].tap_state != 3) { fn_mode = 2; } @@ -394,7 +428,7 @@ void scan_buttons() 1 = pressed 2 = released within timeout, pressing tap key 3 = pressed again within timeout, holding tap key */ - if (buttons[j].tap_enable && buttons[j].tap_state == 0 && (game_mode == false || buttons[j].gm_keycode == NO_KEY)) + if (buttons[j].tap_keycode != NO_KEY && buttons[j].tap_state == 0 && (game_mode == false || buttons[j].gm_keycode == NO_KEY)) { buttons[j].tap_timeout_timestamp = current_timestamp + TAP_TIMEOUT; buttons[j].tap_timeout_enable = true; @@ -402,7 +436,7 @@ void scan_buttons() buttons[j].tap_release_enable = true; buttons[j].tap_state = 1; } - else if (buttons[j].tap_enable && buttons[j].tap_state == 2) + else if (buttons[j].tap_keycode != NO_KEY && buttons[j].tap_state == 2) { buttons[j].tap_timeout_enable = false; buttons[j].tap_release_enable = false; @@ -426,7 +460,7 @@ void scan_buttons() 1 = pressed 2 = released within timeout, pressing tap key 3 = pressed again within timeout, holding tap key */ - if (buttons[j].tap_enable && buttons[j].tap_state == 1 && (game_mode == false || buttons[j].gm_keycode == NO_KEY)) + if (buttons[j].tap_keycode != NO_KEY && buttons[j].tap_state == 1 && (game_mode == false || buttons[j].gm_keycode == NO_KEY)) { buttons[j].tap_release_timestamp = current_timestamp + TAP_TIMEOUT + 10; buttons[j].tap_release_enable = true; @@ -447,11 +481,11 @@ void scan_buttons() /* Check if any "non tap keys" has been pressed */ for (int i = 0; i < NBR_OF_BUTTONS; i++) { - if (buttons[i].run_keycode == true && buttons[i].tap_enable == false && buttons[i].kstate == PRESSED) + if (buttons[i].run_keycode == true && buttons[i].tap_keycode == NO_KEY && buttons[i].kstate == PRESSED) { for (int j = 0; j < NBR_OF_BUTTONS; j++) { - if (buttons[j].tap_enable == true) + if (buttons[j].tap_keycode != NO_KEY) { buttons[j].tap_inhibit = true; } @@ -469,7 +503,7 @@ void scan_buttons() if (buttons[i].kstate == PRESSED) { /* Check if key is in tap mode and not in game mode */ - if (buttons[i].tap_enable == true && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) + if (buttons[i].tap_keycode != NO_KEY && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) { /* Key is in tap mode. Perform action dependant on tap state*/ if (buttons[i].tap_state == 1) @@ -489,26 +523,66 @@ void scan_buttons() /* Key is in normal mode. Perform action dependant on layer*/ if (game_mode == true && buttons[i].gm_keycode != NO_KEY) { - set_key(buttons[i].gm_keycode, PRESSED); + if (buttons[i].gm_keycode == KEY_COMBO) + { + for (int j = 0; j < 3; j++) + { + set_key(buttons[i].combo_keycode[j], PRESSED); + } + } + else + { + set_key(buttons[i].gm_keycode, PRESSED); + } } else if (fn_mode == 1) { - set_key(buttons[i].fn1_keycode, PRESSED); + if (buttons[i].fn1_keycode == KEY_COMBO) + { + for (int j = 0; j < 3; j++) + { + set_key(buttons[i].combo_keycode[j], PRESSED); + } + } + else + { + set_key(buttons[i].fn1_keycode, PRESSED); + } } else if (fn_mode == 2) { - set_key(buttons[i].fn2_keycode, PRESSED); + if (buttons[i].fn2_keycode == KEY_COMBO) + { + for (int j = 0; j < 3; j++) + { + set_key(buttons[i].combo_keycode[j], PRESSED); + } + } + else + { + set_key(buttons[i].fn2_keycode, PRESSED); + } } else { - set_key(buttons[i].keycode, PRESSED); + if (buttons[i].keycode == KEY_COMBO) + { + for (int j = 0; j < 3; j++) + { + set_key(buttons[i].combo_keycode[j], PRESSED); + } + } + else + { + set_key(buttons[i].keycode, PRESSED); + } } } } else if (buttons[i].kstate == RELEASED) { /* Check if key is in tap mode */ - if (buttons[i].tap_enable == true && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) + if (buttons[i].tap_keycode != NO_KEY && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) { /* Key is in tap mode. Perform action dependant on tap state*/ if (buttons[i].tap_state == 2) @@ -534,10 +608,25 @@ void scan_buttons() /* Key is in normal mode. Perform action dependant on layer*/ if (game_mode == true && buttons[i].gm_keycode != NO_KEY) { - set_key(buttons[i].gm_keycode, RELEASED); + if (buttons[i].gm_keycode == KEY_COMBO) + { + for (int j = 0; j < 3; j++) + { + set_key(buttons[i].combo_keycode[j], RELEASED); + } + } + else + { + set_key(buttons[i].gm_keycode, RELEASED); + } } else { + for (int j = 0; j < 3; j++) + { + set_key(buttons[i].combo_keycode[j], RELEASED); + } + set_key(buttons[i].fn2_keycode, RELEASED); set_key(buttons[i].fn1_keycode, RELEASED); set_key(buttons[i].keycode, RELEASED); @@ -573,6 +662,7 @@ void setup() /* Init HW */ pinMode(STATUS_LED, OUTPUT); digitalWrite(STATUS_LED, LOW); + Mouse.begin(); } void loop() @@ -619,7 +709,7 @@ void loop() } } - /* Update mouse wheel 20ms */ + /* Update mouse 20ms */ if (current_timestamp >= mouse_wheel_timestamp && mouse_wheel != 0) { Mouse.move(mouse_x, mouse_y, mouse_wheel);