From fb0cb2d1f30d3b33ea14029b43a8087a87b90a36 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sun, 6 Nov 2022 11:23:55 +0100 Subject: [PATCH] Removed Game mode. Optimized key assignment --- firmware/src/main.cpp | 201 ++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 133 deletions(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 6397d27..9cd46a6 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -34,28 +34,21 @@ * | 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 |-------------------- + * ----------------| Alt | Spc | 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 |-------------------- + * | Ctrl/Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ´ | + * | Shift | 6 | 7 | 8 | 9 | 0 | | | < | ' | ¨ | + | Shift/Enter | + * ----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- * -------------------------- ------------------------- * Layer 2 * ------------------------------------------ --------------------------------------------- * | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | MWU | CapsLock | - * | Ctrl/Esc | Prev| Play| Next| | | | Left| Down| Up |Right| MWD | Game Mode | - * | Shift | | | | | | | Home| PgD | PgU | End | Ins | Shift/Enter | - * ----------------| M1/M2 | Alt | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- - * -------------------------- ------------------------- - * Game mode - * ------------------------------------------ --------------------------------------------- - * | Tab | | | | | | | | | | | | | - * | Ctrl | | | | | | | | | | | | | - * | | | | | | | | | | | | | | - * ----------------| Alt | Spc | | | | | |-------------------- + * | Ctrl/Esc | Prev| Play| Next| M1 | M2 | | Left| Down| Up |Right| MWD | | + * | Shift | § | Del | | | M3 | | Home| PgD | PgU | End | Ins | Shift/Enter | + * ----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- * -------------------------- ------------------------- * * Features: @@ -67,9 +60,7 @@ * * 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 button * * Tap/Hold functionality (only for layer0) * * Combo key (up to three simultaneous keys) support. Configurable for each button */ @@ -94,10 +85,9 @@ #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 KEY_COMBO 12 + KEY_OFFSET // Combo key (pressing all key defined in combo array) -#define TAP_TIMEOUT 160 // Key tap timeout (ms) +#define TAP_TIMEOUT 140 // Key tap timeout (ms) #define NBR_OF_BUTTONS 42 // Number of buttons used (42 in this case) struct Button @@ -107,7 +97,6 @@ struct Button uint16_t tap_keycode = NO_KEY; uint16_t fn1_keycode = NO_KEY; uint16_t fn2_keycode = NO_KEY; - uint16_t gm_keycode = NO_KEY; bool hold_direct = true; uint16_t combo_keycode[3] = {NO_KEY, NO_KEY, NO_KEY}; int kstate = IDLE; @@ -156,49 +145,49 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, // clang-format off Button buttons[NBR_OF_BUTTONS] = { -/* 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, 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, 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, KEY_ML, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, - {8, KEY_U, NO_KEY, KEY_F7, KEY_MD, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, - {9, KEY_I, NO_KEY, KEY_F8, KEY_MU, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, - {10, KEY_O, NO_KEY, KEY_F9, KEY_MR, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, - {11, KEY_P, NO_KEY, KEY_F10, KEY_MWU, 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, KEY_MWD, 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_M2, KEY_M1, 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}}; +/* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key Hold direct Combo keys */ + {1, KEY_FN2, KEY_TAB, 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, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {7, KEY_Y, NO_KEY, KEY_F6, KEY_ML, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {8, KEY_U, NO_KEY, KEY_F7, KEY_MD, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {9, KEY_I, NO_KEY, KEY_F8, KEY_MU, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {10, KEY_O, NO_KEY, KEY_F9, KEY_MR, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {11, KEY_P, NO_KEY, KEY_F10, KEY_MWU, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, 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, 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, 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, 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, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {17, KEY_F, NO_KEY, KEY_4, KEY_M1, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {18, KEY_G, NO_KEY, KEY_5, KEY_M2, 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, 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, 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, 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, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {23, 'ö', NO_KEY, KEY_0, KEY_MWD, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {24, 'ä', NO_KEY, KEY_EQUAL, 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, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {26, KEY_Z, NO_KEY, KEY_6, '§', false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {27, KEY_X, NO_KEY, KEY_7, KEY_DELETE, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {28, KEY_C, NO_KEY, KEY_8, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {29, KEY_V, NO_KEY, KEY_9, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {30, KEY_B, NO_KEY, KEY_0, KEY_M3, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {31, KEY_N, NO_KEY, NO_KEY, KEY_HOME, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {32, KEY_M, NO_KEY, '<', KEY_PAGE_DOWN, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {33, KEY_COMMA, NO_KEY, KEY_BACKSLASH, KEY_PAGE_UP, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {34, KEY_PERIOD, NO_KEY, KEY_RIGHT_BRACE, KEY_END, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {35, KEY_SLASH, NO_KEY, KEY_MINUS, KEY_INSERT, 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, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {37, KEY_LEFT_ALT, NO_KEY, KEY_LEFT_ALT, KEY_LEFT_ALT, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {38, KEY_SPACE, NO_KEY, KEY_SPACE, 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, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}, + {40, KEY_FN1, KEY_SPACE, 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, 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, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false}}; // clang-format on /* End of keymap config -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ @@ -219,7 +208,6 @@ int mouse_x = 0; int mouse_y = 0; int mouse_wheel = 0; -bool game_mode = false; bool key_pressed = false; /** @@ -313,19 +301,6 @@ bool set_key(uint16_t keycode, uint8_t kstate) } } - /* Toggle game mode */ - else if (keycode == KEY_GM) - { - if (kstate == PRESSED && game_mode == true) - { - game_mode = false; - } - else if (kstate == PRESSED && game_mode == false) - { - game_mode = true; - } - } - /* Normal keyboard keys (HID keyboard) */ else { @@ -390,12 +365,12 @@ void scan_buttons() if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar) { /* Check if FN1 key are defined to this button (Layer 0 and first position in combo array)*/ - if ((buttons[j].keycode == KEY_FN1 || (buttons[j].keycode == KEY_COMBO && buttons[j].combo_keycode[0] == 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)) { fn_mode = 1; } /* Check if FN2 key are defined to this button (Layer 0 and first position in combo array)*/ - else if ((buttons[j].keycode == KEY_FN2 || (buttons[j].keycode == KEY_COMBO && buttons[j].combo_keycode[0] == 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)) { fn_mode = 2; } @@ -419,7 +394,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_keycode != NO_KEY && 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) { buttons[j].tap_timeout_timestamp = current_timestamp + TAP_TIMEOUT; buttons[j].tap_timeout_enable = true; @@ -451,7 +426,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_keycode != NO_KEY && 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) { buttons[j].tap_release_timestamp = current_timestamp + TAP_TIMEOUT + 10; buttons[j].tap_release_enable = true; @@ -493,8 +468,8 @@ void scan_buttons() /* Check if key pressed or released */ if (buttons[i].kstate == PRESSED) { - /* Check if key is in tap mode and not in game mode */ - if (buttons[i].tap_keycode != NO_KEY && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) + /* Check if key is in tap mode */ + if (buttons[i].tap_keycode != NO_KEY) { /* Key is in tap mode. Perform action dependant on tap state*/ if (buttons[i].tap_state == 1) @@ -511,23 +486,7 @@ void scan_buttons() } else { - /* Key is in normal mode. Perform action dependant on layer*/ - if (game_mode == true && buttons[i].gm_keycode != NO_KEY) - { - if (buttons[i].gm_keycode == KEY_COMBO) - { - /* Sending press command for all combo keys */ - 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) + if (fn_mode == 1) { if (buttons[i].fn1_keycode == KEY_COMBO) { @@ -577,7 +536,7 @@ void scan_buttons() else if (buttons[i].kstate == RELEASED) { /* Check if key is in tap mode */ - if (buttons[i].tap_keycode != NO_KEY && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) + if (buttons[i].tap_keycode != NO_KEY) { /* Key is in tap mode. Perform action dependant on tap state*/ if (buttons[i].tap_state == 2) @@ -600,35 +559,16 @@ void scan_buttons() } else { - /* Key is in normal mode. Perform action dependant on layer*/ - if (game_mode == true && buttons[i].gm_keycode != NO_KEY) + /* Sending release command for all combo keys */ + for (int j = 0; j < 3; j++) { - if (buttons[i].gm_keycode == KEY_COMBO) - { - /* Sending release command for all combo keys */ - for (int j = 0; j < 3; j++) - { - set_key(buttons[i].combo_keycode[j], RELEASED); - } - } - else - { - set_key(buttons[i].gm_keycode, RELEASED); - } + set_key(buttons[i].combo_keycode[j], RELEASED); } - else - { - /* Sending release command for all combo keys */ - for (int j = 0; j < 3; j++) - { - set_key(buttons[i].combo_keycode[j], RELEASED); - } - /* Sending release command for all other keycodes related to this button */ - set_key(buttons[i].fn2_keycode, RELEASED); - set_key(buttons[i].fn1_keycode, RELEASED); - set_key(buttons[i].keycode, RELEASED); - } + /* Sending release command for all other keycodes related to this button */ + set_key(buttons[i].fn2_keycode, RELEASED); + set_key(buttons[i].fn1_keycode, RELEASED); + set_key(buttons[i].keycode, RELEASED); } } /* Reset run_keycode flag */ @@ -643,11 +583,6 @@ void scan_buttons() /* 2 = blinking (CapsLock) */ status_led_mode = 2; } - else if (game_mode == true) - { - /* 1 = constant on (Game mode) */ - status_led_mode = 1; - } else { /* 0 = off (normal) */ @@ -681,7 +616,7 @@ void loop() { if (buttons[i].tap_state == 1) { - if (buttons[i].hold_direct == false && (game_mode == false || buttons[i].gm_keycode == NO_KEY)) + if (buttons[i].hold_direct == false) { set_key(buttons[i].keycode, PRESSED); }