From 3aaf7448000a0f716e0a8292fa2325efc1b41593 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sun, 20 Nov 2022 17:49:40 +0100 Subject: [PATCH] Changed key assignment --- firmware/src/main.cpp | 144 ++++++++++++++++++++++++------------------ 1 file changed, 82 insertions(+), 62 deletions(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 827fd15..d175885 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -30,26 +30,26 @@ * "usb_keyboard" library for HID keyboard/mouse usb data communication. * * Layer 0 - * ------------------------------------------ --------------------------------------- - * | Fn2/Tab | 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 | - * -----------------------| Alt | Spc | Fn1 | | Spc | Entr| Win |-------------------- - * ------------------- ------------------- + * --------------------------------------- --------------------------------------- + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Å | + * | Ctrl | A | S | D | F | G | | H | J | K | L | Ö | Ä | + * | Shift | Z | X | C | V | B | | N | M | , | . | - | Shift | + * --------------------| Alt | Fn1 | Spc | | Spc | Fn1 | Win |-------------------- + * ------------------- ------------------- * Layer 1 (Fn1) - * ------------------------------------------ --------------------------------------- - * | Fn2/Tab | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | - * | Ctrl/Esc | 1 | 2 | 3 | 4 | 5 | | Left| Down| Up |Right| Del | § | - * | Shift | 6 | 7 | 8 | 9 | 0 | | < | ´ | ' | ¨ | + | Shift | - * -----------------------| Alt | Spc | Fn1 | | BSpc| AltG| Win |-------------------- - * ------------------- ------------------- + * --------------------------------------- --------------------------------------- + * | Esc | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | BSpc | + * | Ctrl | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Enter | + * | Shift | 6 | 7 | 8 | 9 | 0 | | < | ´ | ' | ¨ | + | Shift | + * --------------------| Alt | Fn1 | Spc | | BSpc| Fn1 | AlrG|-------------------- + * ------------------- ------------------- * Layer 2 (Fn2) - * ------------------------------------------ --------------------------------------- - * | Fn2/Tab | F12 | F13 | F14 | F15 | F16 | | | M1 | M2 | M3 | MWU | CapLk | - * | Ctrl/Esc | Play| Next| F17 | F18 | F19 | | ML | MD | MU | MR | MWD | Esc | - * | Shift | F20 | F21 | F22 | F23 | F24 | | Home| PgD | PgU | End | Ins | Shift | - * -----------------------| Alt | Win | Fn1 | | | | |-------------------- - * ------------------- ------------------- + * --------------------------------------- --------------------------------------- + * | F11 | F12 | F13 | F14 | F15 | F16 | | § | MWD | MWU | | | CapLk | + * | Ctrl | Play| Next| F17 | F18 | F19 | | Left| Down| Up |Right| Del | | + * | Shift | F20 | F21 | F22 | F23 | F24 | | Home| PgD | PgU | End | Ins | Shift | + * --------------------| Alt | Fn1 | Win | | | Fn1 | |-------------------- + * ------------------- ------------------- * Features: * * * 42 keys "Split" keyboard layout. 36 finger buttons and 6 thumb buttons. @@ -139,33 +139,34 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, /* Keymap config ----------------------------------------------------------------------------------------------------------------------------------- */ // clang-format off + Button buttons[NBR_OF_BUTTONS] = { /* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key Hold direct */ - {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, true, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {1, KEY_TAB, NO_KEY, KEY_ESC, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {7, KEY_Y, NO_KEY, KEY_F6, '§', false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {8, KEY_U, NO_KEY, KEY_F7, KEY_M1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {9, KEY_I, NO_KEY, KEY_F8, KEY_M2, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {10, KEY_O, NO_KEY, KEY_F9, KEY_M3, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {11, KEY_P, NO_KEY, KEY_F10, KEY_MWU, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {13, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, true, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {12, 'å', NO_KEY, KEY_BACKSPACE, KEY_CAPS_LOCK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {13, KEY_LEFT_CTRL, NO_KEY, KEY_LEFT_CTRL, KEY_LEFT_CTRL, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PLAY_PAUSE, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {15, KEY_S, NO_KEY, KEY_2, KEY_MEDIA_NEXT_TRACK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {16, KEY_D, NO_KEY, KEY_3, KEY_F17, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {17, KEY_F, NO_KEY, KEY_4, KEY_F18, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {18, KEY_G, NO_KEY, KEY_5, KEY_F19, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {19, KEY_H, NO_KEY, KEY_LEFT_ARROW, KEY_ML, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {20, KEY_J, NO_KEY, KEY_DOWN_ARROW, KEY_MD, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {21, KEY_K, NO_KEY, KEY_UP_ARROW, KEY_MU, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {22, KEY_L, NO_KEY, KEY_RIGHT_ARROW, KEY_MR, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {23, 'ö', NO_KEY, KEY_DELETE, KEY_MWD, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {24, 'ä', NO_KEY, '§', KEY_ESC, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {19, KEY_H, NO_KEY, KEY_6, KEY_LEFT_ARROW, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {20, KEY_J, NO_KEY, KEY_7, KEY_DOWN_ARROW, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {21, KEY_K, NO_KEY, KEY_8, KEY_UP_ARROW, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {22, KEY_L, NO_KEY, KEY_9, KEY_RIGHT_ARROW, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {23, 'ö', NO_KEY, KEY_0, KEY_DELETE, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {24, 'ä', NO_KEY, KEY_ENTER, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {25, KEY_LEFT_SHIFT, NO_KEY, KEY_LEFT_SHIFT, KEY_LEFT_SHIFT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {26, KEY_Z, NO_KEY, KEY_6, KEY_F20, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {27, KEY_X, NO_KEY, KEY_7, KEY_F21, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, @@ -179,11 +180,11 @@ Button buttons[NBR_OF_BUTTONS] = {35, KEY_SLASH, NO_KEY, KEY_MINUS, KEY_INSERT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {36, KEY_RIGHT_SHIFT, NO_KEY, KEY_RIGHT_SHIFT, KEY_RIGHT_SHIFT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {37, KEY_LEFT_ALT, NO_KEY, KEY_LEFT_ALT, KEY_LEFT_ALT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {38, KEY_SPACE, NO_KEY, KEY_SPACE, KEY_LEFT_GUI, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {39, KEY_FN1, NO_KEY, KEY_FN1, KEY_FN1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {38, KEY_FN1, NO_KEY, KEY_FN1, KEY_FN1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {39, KEY_SPACE, NO_KEY, KEY_SPACE, KEY_LEFT_GUI, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {40, KEY_SPACE, NO_KEY, KEY_BACKSPACE, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {41, KEY_ENTER, NO_KEY, KEY_RIGHT_ALT, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}}; + {41, KEY_FN1, NO_KEY, KEY_FN1, KEY_FN1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {42, KEY_LEFT_GUI, NO_KEY, KEY_RIGHT_ALT, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}}; // clang-format on /* End of keymap config ----------------------------------------------------------------------------------------------------------------------------- */ @@ -351,7 +352,7 @@ void scan_buttons() _reboot_Teensyduino_(); } - /* Check for FN mode */ + /* Check for Fn1 mode */ int fn_mode = 0; for (int i = 0; i < LIST_MAX; i++) { @@ -364,18 +365,35 @@ void scan_buttons() /* Check if FN1 key are defined to this button (Layer 0 and first position in combo array)*/ if (buttons[j].keycode == 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) - { - fn_mode = 2; + fn_mode++; } break; } } } } + + if (fn_mode == 0) + { + for (int i = 0; i < LIST_MAX; i++) + { + if (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD) + { + for (int j = 0; j < NBR_OF_BUTTONS; j++) + { + if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar) + { + /* Check if FN2 key are defined to this button (Layer 0 and first position in combo array)*/ + if (buttons[j].keycode == KEY_FN2) + { + fn_mode = 2; + } + break; + } + } + } + } + } /* Process key press/release */ for (int i = 0; i < LIST_MAX; i++) @@ -465,33 +483,23 @@ 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_keycode != NO_KEY) + if (fn_mode == 0) { - /* Key is in tap mode. Perform action dependant on tap state*/ - if (buttons[i].tap_state == 1) + /* Check if key is in tap mode */ + if (buttons[i].tap_keycode != NO_KEY) { - if (buttons[i].hold_direct == true) + /* Key is in tap mode. Perform action dependant on tap state*/ + if (buttons[i].tap_state == 1) { - /* Press hold key if "hold direct" is enabled (tap state = 1) */ - 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) - { - set_key(buttons[i].fn1_keycode, PRESSED); - buttons[i].last_keycode = buttons[i].fn1_keycode; - } - else if (fn_mode == 2) - { - set_key(buttons[i].fn2_keycode, PRESSED); - buttons[i].last_keycode = buttons[i].fn2_keycode; + /* Reset tap inhibit flag */ + buttons[i].tap_inhibit = false; + } } else { @@ -499,6 +507,16 @@ void scan_buttons() buttons[i].last_keycode = buttons[i].keycode; } } + else if (fn_mode == 1) + { + set_key(buttons[i].fn1_keycode, PRESSED); + buttons[i].last_keycode = buttons[i].fn1_keycode; + } + else if (fn_mode == 2) + { + set_key(buttons[i].fn2_keycode, PRESSED); + buttons[i].last_keycode = buttons[i].fn2_keycode; + } } else if (buttons[i].kstate == RELEASED) { @@ -511,6 +529,7 @@ void scan_buttons() /* 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].last_keycode, RELEASED); if (buttons[i].tap_inhibit == false) { set_key(buttons[i].tap_keycode, PRESSED); @@ -521,6 +540,7 @@ void scan_buttons() /* Release all keys (tap state = 0,1,3) */ set_key(buttons[i].keycode, RELEASED); set_key(buttons[i].tap_keycode, RELEASED); + set_key(buttons[i].last_keycode, RELEASED); buttons[i].tap_state = 0; } }