From 01a6a7c028588f995876df552938077fda692224 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sun, 16 Oct 2022 00:27:33 +0200 Subject: [PATCH] Added game mode and tap_inhibit --- firmware/src/main.cpp | 250 +++++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 102 deletions(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 3f655ba..b21d44e 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -48,18 +48,18 @@ #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 -#define KEY_M2 4 + KEY_OFFSET // Mouse button 2 -#define KEY_M3 5 + KEY_OFFSET // Mouse button 3 +#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_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 TAP_TIMEOUT 150 // Key tap timeout (ms) +#define TAP_TIMEOUT 160 // Key tap timeout (ms) #define NBR_OF_BUTTONS 21 // Number of buttons used (42 in this case) struct Button @@ -68,11 +68,10 @@ struct Button uint16_t keycode = NO_KEY; uint16_t tap_keycode = NO_KEY; uint16_t fn1_keycode = NO_KEY; - uint16_t fn1_tap_keycode = NO_KEY; uint16_t fn2_keycode = NO_KEY; - uint16_t fn2_tap_keycode = NO_KEY; uint16_t gm_keycode = NO_KEY; bool tap_enable = false; + bool hold_direct = true; int kstate = IDLE; bool run_keycode = false; int tap_state = 0; @@ -80,6 +79,7 @@ struct Button bool tap_release_enable = false; unsigned long tap_timeout_timestamp = 0; unsigned long tap_release_timestamp = 0; + bool tap_inhibit = false; }; const byte KP_ROWS = 4; @@ -97,27 +97,27 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, Button buttons[NBR_OF_BUTTONS] = { - {1, KEY_FN1, KEY_TAB, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, - {2, KEY_Q, NO_KEY, KEY_GM, NO_KEY, KEY_F12, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {3, KEY_W, NO_KEY, KEY_F2, NO_KEY, KEY_F13, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {4, KEY_E, NO_KEY, KEY_F3, NO_KEY, KEY_F14, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {5, KEY_R, NO_KEY, KEY_F4, NO_KEY, KEY_F15, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {6, KEY_T, NO_KEY, KEY_F5, NO_KEY, KEY_F16, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {8, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {9, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {10, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {11, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {12, 'å', NO_KEY, KEY_F11, NO_KEY, KEY_CAPS_LOCK, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {13, KEY_LEFT_CTRL, KEY_DELETE, KEY_LEFT_CTRL, KEY_DELETE, KEY_LEFT_CTRL, KEY_DELETE, KEY_SPACE, true, IDLE, false, 0, false, false, 0, 0}, - {14, KEY_A, NO_KEY, KEY_1, NO_KEY, KEY_MEDIA_PREV_TRACK, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {15, KEY_S, NO_KEY, KEY_2, NO_KEY, KEY_MEDIA_PLAY_PAUSE, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {16, KEY_D, NO_KEY, KEY_3, NO_KEY, KEY_MEDIA_NEXT_TRACK, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {17, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {18, KEY_G, NO_KEY, KEY_5, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {19, KEY_H, NO_KEY, KEY_6, NO_KEY, KEY_LEFT_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {20, KEY_J, NO_KEY, KEY_7, NO_KEY, KEY_DOWN_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, - {21, KEY_K, NO_KEY, KEY_8, NO_KEY, KEY_UP_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}}; + {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_2, KEY_MEDIA_PLAY_PAUSE, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, + {16, KEY_C, NO_KEY, KEY_3, KEY_MEDIA_NEXT_TRACK, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, + {17, KEY_V, NO_KEY, KEY_4, NO_KEY, NO_KEY, false, true, IDLE, false, 0, false, false, 0, 0, false}, + {18, KEY_B, NO_KEY, KEY_5, 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}}; // const byte KP_ROWS = 4; // const byte KP_COLS = 12; @@ -125,60 +125,64 @@ Button buttons[NBR_OF_BUTTONS] = // byte kp_colPins[KP_COLS] = {12, 11, 10, 9, 8, 7, 26, 25, 24, 23, 22, 21}; // // @formatter:off -// Keymap (key ID) +// 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}}; +// {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); +// // Button keymap. +// // 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. // Button buttons[NBR_OF_BUTTONS] = // { -// // key ID Fn0 (hold) key Fn0 tap key Fn1 (hold) key Fn1 tap key Fn2 (hold) key Fn2 tap key GM replace key tap enable -// {1, KEY_FN2, KEY_TAB, KEY_FN2, KEY_TAB, KEY_FN2, KEY_TAB, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, -// {2, KEY_Q, NO_KEY, KEY_F1, NO_KEY, KEY_F12, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {3, KEY_W, NO_KEY, KEY_F2, NO_KEY, KEY_F13, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {4, KEY_E, NO_KEY, KEY_F3, NO_KEY, KEY_F14, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {5, KEY_R, NO_KEY, KEY_F4, NO_KEY, KEY_F15, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {6, KEY_T, NO_KEY, KEY_F5, NO_KEY, KEY_F16, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {8, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {9, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {10, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {11, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {12, 'å', NO_KEY, KEY_F11, NO_KEY, KEY_CAPS_LOCK, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {13, KEY_LEFT_CTRL, KEY_ESC, KEY_LEFT_CTRL, KEY_ESC, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, -// {14, KEY_A, NO_KEY, KEY_1, NO_KEY, KEY_MEDIA_PREV_TRACK, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {15, KEY_S, NO_KEY, KEY_2, NO_KEY, KEY_MEDIA_PLAY_PAUSE, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {16, KEY_D, NO_KEY, KEY_3, NO_KEY, KEY_MEDIA_NEXT_TRACK, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {17, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {18, KEY_G, NO_KEY, KEY_5, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {19, KEY_H, NO_KEY, KEY_6, NO_KEY, KEY_LEFT_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {20, KEY_J, NO_KEY, KEY_7, NO_KEY, KEY_DOWN_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {21, KEY_K, NO_KEY, KEY_8, NO_KEY, KEY_UP_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {22, KEY_L, NO_KEY, KEY_9, NO_KEY, KEY_RIGHT_ARROW, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {23, 'ö', NO_KEY, KEY_0, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {24, 'ä', NO_KEY, KEY_EQUAL, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {25, KEY_LEFT_SHIFT, KEY_DELETE, KEY_LEFT_SHIFT, KEY_DELETE, KEY_LEFT_SHIFT, KEY_DELETE, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, -// {26, KEY_Z, NO_KEY, '§', NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {27, KEY_X, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {28, KEY_C, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {29, KEY_V, NO_KEY, '<', NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {30, KEY_B, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {31, KEY_N, NO_KEY, NO_KEY, NO_KEY, KEY_HOME, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {32, KEY_M, NO_KEY, KEY_BACKSLASH, NO_KEY, KEY_PAGE_DOWN, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {33, KEY_COMMA, NO_KEY, KEY_RIGHT_BRACE, NO_KEY, KEY_PAGE_UP, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {34, KEY_PERIOD, NO_KEY, KEY_MINUS, NO_KEY, KEY_END, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {35, KEY_SLASH, NO_KEY, NO_KEY, NO_KEY, KEY_INSERT, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {36, KEY_RIGHT_SHIFT, KEY_ENTER, KEY_RIGHT_SHIFT, KEY_ENTER, KEY_RIGHT_SHIFT, KEY_ENTER, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, -// {37, KEY_M1, KEY_M2, KEY_M1, KEY_M2, KEY_M1, KEY_M2, KEY_LEFT_ALT, true, IDLE, false, 0, false, false, 0, 0}, -// {38, KEY_LEFT_ALT, KEY_SPACE, KEY_LEFT_ALT, KEY_SPACE, KEY_LEFT_ALT, KEY_SPACE, KEY_SPACE, true, IDLE, false, 0, false, false, 0, 0}, -// {39, KEY_FN1, KEY_BACKSPACE, KEY_FN1, KEY_BACKSPACE, KEY_FN1, KEY_BACKSPACE, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, -// {40, KEY_FN1, KEY_SPACE, KEY_FN1, KEY_SPACE, KEY_FN1, KEY_SPACE, NO_KEY, true, IDLE, false, 0, false, false, 0, 0}, -// {41, KEY_RIGHT_ALT, NO_KEY, KEY_RIGHT_ALT, NO_KEY, KEY_RIGHT_ALT, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}, -// {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0}}; +// // key ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key GM replace key tap enable +// {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0, false}, +// {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {8, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {9, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {10, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {11, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {13, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0, false}, +// {14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {15, KEY_S, NO_KEY, KEY_2, KEY_MEDIA_PLAY_PAUSE, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {16, KEY_D, NO_KEY, KEY_3, KEY_MEDIA_NEXT_TRACK, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {17, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {18, KEY_G, NO_KEY, KEY_5, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {19, KEY_H, NO_KEY, KEY_6, KEY_LEFT_ARROW, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {20, KEY_J, NO_KEY, KEY_7, KEY_DOWN_ARROW, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {21, KEY_K, NO_KEY, KEY_8, KEY_UP_ARROW, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {22, KEY_L, NO_KEY, KEY_9, KEY_RIGHT_ARROW, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {23, 'ö', NO_KEY, KEY_0, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {24, 'ä', NO_KEY, KEY_EQUAL, KEY_GM, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {25, KEY_LEFT_SHIFT, KEY_DELETE, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0, false}, +// {26, KEY_Z, NO_KEY, '§', NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {27, KEY_X, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {28, KEY_C, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {29, KEY_V, NO_KEY, '<', NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {30, KEY_B, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {31, KEY_N, NO_KEY, NO_KEY, KEY_HOME, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {32, KEY_M, NO_KEY, KEY_BACKSLASH, KEY_PAGE_DOWN, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {33, KEY_COMMA, NO_KEY, KEY_RIGHT_BRACE, KEY_PAGE_UP, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {34, KEY_PERIOD, NO_KEY, KEY_MINUS, KEY_END, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {35, KEY_SLASH, NO_KEY, NO_KEY, KEY_INSERT, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {36, KEY_RIGHT_SHIFT, KEY_ENTER, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0, false}, +// {37, KEY_M1, KEY_M2, NO_KEY, NO_KEY, KEY_LEFT_ALT, true, IDLE, false, 0, false, false, 0, 0, false}, +// {38, KEY_LEFT_ALT, KEY_SPACE, NO_KEY, NO_KEY, KEY_SPACE, true, IDLE, false, 0, false, false, 0, 0, false}, +// {39, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0, false}, +// {40, KEY_FN1, KEY_SPACE, NO_KEY, NO_KEY, NO_KEY, true, IDLE, false, 0, false, false, 0, 0, false}, +// {41, KEY_RIGHT_ALT, NO_KEY, KEY_RIGHT_ALT, KEY_RIGHT_ALT, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}, +// {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, KEY_LEFT_GUI, NO_KEY, false, IDLE, false, 0, false, false, 0, 0, false}}; // // @formatter:on const int STATUS_LED = 13; @@ -195,6 +199,7 @@ int mouse_y = 0; int mouse_wheel = 0; bool game_mode = false; +bool key_pressed = false; bool set_key(uint16_t keycode, uint8_t kstate) { @@ -329,18 +334,19 @@ void scan_buttons() { for (int j = 0; j < NBR_OF_BUTTONS; j++) { - if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar && buttons[j].run_keycode == false) + if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar && kp_keypad.key[i].stateChanged == true) { // Tap state: // 0 = idle (not pressed for a while) // 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) + if (buttons[j].tap_enable && 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; - buttons[j].tap_release_enable = false; + buttons[j].tap_release_timestamp = current_timestamp + TAP_TIMEOUT + 10; + buttons[j].tap_release_enable = true; buttons[j].tap_state = 1; } else if (buttons[j].tap_enable && buttons[j].tap_state == 2) @@ -360,14 +366,14 @@ void scan_buttons() { for (int j = 0; j < NBR_OF_BUTTONS; j++) { - if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar && buttons[j].run_keycode == false) + if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar && kp_keypad.key[i].stateChanged == true) { // Tap state: // 0 = idle (not pressed for a while) // 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) + if (buttons[j].tap_enable && 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; @@ -377,7 +383,6 @@ void scan_buttons() { buttons[j].tap_state = 0; } - buttons[j].run_keycode = true; buttons[j].kstate = RELEASED; break; @@ -386,6 +391,21 @@ 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) + { + for (int j = 0; j < NBR_OF_BUTTONS; j++) + { + if (buttons[j].tap_enable == true) + { + buttons[j].tap_inhibit = true; + } + } + } + } + // Execute key commands for (int i = 0; i < NBR_OF_BUTTONS; i++) { @@ -395,19 +415,28 @@ void scan_buttons() // Check if key pressed or released if (buttons[i].kstate == PRESSED) { - // Check if key is in tap mode - if (buttons[i].tap_enable == true) + // 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_state == 1) { - // Tap state: - // 1 = pressed - set_key(buttons[i].keycode, PRESSED); + if (buttons[i].hold_direct == true) + { + // Press hold key if "hold direct" is enabled (tap state = 1) + set_key(buttons[i].keycode, PRESSED); + } + + // Reset tap inhibit flag + buttons[i].tap_inhibit = false; } } else { - if (fn_mode == 1) + if (game_mode == true && buttons[i].gm_keycode != NO_KEY) + { + set_key(buttons[i].gm_keycode, PRESSED); + } + else if (fn_mode == 1) { set_key(buttons[i].fn1_keycode, PRESSED); } @@ -424,22 +453,21 @@ void scan_buttons() else if (buttons[i].kstate == RELEASED) { // Check if key is in tap mode - if (buttons[i].tap_enable == true) + if (buttons[i].tap_enable == true && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) { if (buttons[i].tap_state == 2) { - // Tap state: - // 2 = released within timeout, pressing tap key + // Press tap key if no other keys are pressed (tap state = 2) set_key(buttons[i].tap_keycode, RELEASED); // Fix for not send press and hold for the tap key set_key(buttons[i].keycode, RELEASED); - set_key(buttons[i].tap_keycode, PRESSED); + if (buttons[i].tap_inhibit == false) + { + set_key(buttons[i].tap_keycode, PRESSED); + } } else { - // Tap state: - // 0 = idle (not pressed for a while) - // 1 = pressed - // 3 = pressed again within timeout, holding tap key + // Release all keys (tap state = 0,1,3) set_key(buttons[i].keycode, RELEASED); set_key(buttons[i].tap_keycode, RELEASED); buttons[i].tap_state = 0; @@ -447,9 +475,16 @@ void scan_buttons() } else { - set_key(buttons[i].fn2_keycode, RELEASED); - set_key(buttons[i].fn1_keycode, RELEASED); - set_key(buttons[i].keycode, RELEASED); + if (game_mode == true && buttons[i].gm_keycode != NO_KEY) + { + set_key(buttons[i].gm_keycode, RELEASED); + } + else + { + set_key(buttons[i].fn2_keycode, RELEASED); + set_key(buttons[i].fn1_keycode, RELEASED); + set_key(buttons[i].keycode, RELEASED); + } } } // Reset run_keycode flag @@ -458,6 +493,10 @@ void scan_buttons() } } + // Status indication + // 0 = off (normal) + // 1 = constant on (Game mode) + // 2 = blinking (CapsLock) if (keyboard_leds & (1 << USB_LED_CAPS_LOCK)) { status_led_mode = 2; @@ -474,7 +513,6 @@ void scan_buttons() void setup() { - // Turn on and off power led. pinMode(STATUS_LED, OUTPUT); digitalWrite(STATUS_LED, LOW); } @@ -500,7 +538,15 @@ void loop() { if (current_timestamp >= buttons[i].tap_timeout_timestamp && buttons[i].tap_timeout_enable) { - if (buttons[i].tap_state == 1 || buttons[i].tap_state == 2) + if (buttons[i].tap_state == 1) + { + if (buttons[i].hold_direct == false && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) + { + set_key(buttons[i].keycode, PRESSED); + } + buttons[i].tap_state = 0; + } + else if (buttons[i].tap_state == 2) { buttons[i].tap_state = 0; }