From 243402c98da959f5f8189fa4925cb4095191ff72 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Wed, 9 Nov 2022 00:33:32 +0100 Subject: [PATCH] Updated key assignment --- firmware/src/main.cpp | 90 ++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 56 deletions(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 26d77a6..cb7d3a1 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -30,47 +30,25 @@ * "usb_keyboard" library for HID keyboard/mouse usb data communication. * * 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 | - * -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | Fn1+AltGr | Win |---------------- - * ------------------------- ----------------------------- + * ------------------------------------------ ------------------------------------- + * | 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 | , | . | - | Fn2 | + * -----------------------| Alt | Spc | Fn1 | | Spc | Entr| Win |------------------ + * ------------------- ------------------- * Layer 1 (Fn1) - * ------------------------------------------ --------------------------------------------- - * | 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 | 6 | 7 | 8 | 9 | 0 | | F12 | < | ' | ¨ | + | Shift/Enter | - * -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | Fn1+AltGr | Win |---------------- - * ------------------------- ----------------------------- + * ------------------------------------------ ------------------------------------- + * | Tab | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | Ctrl/Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | § | + * | Shift | 6 | 7 | 8 | 9 | 0 | | < | ´ | ' | ¨ | + | Fn2 | + * -----------------------| Alt | Spc | Fn1 | | BSpc| AltG| Win |------------------ + * ------------------- ------------------- * Layer 2 (Fn2) - * ------------------------------------------ --------------------------------------------- - * | Tab/Fn2 | F13 | F14 | F15 | F16 | F17 | | ML | MD | MU | MR | MWU | CapsLock | - * | Ctrl/Esc | Prev| Play| Next| M1 | M2 | | Left| Down| Up |Right| MWD | F18 | - * | Shift | § | Del | F19 | F20 | M3 | | Home| PgD | PgU | End | Ins | Shift/Enter | - * -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | 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 | - * -----------------------| Alt | Spc | Fn1 | | Spc | Enter | Win |------------------ - * ------------------- --------------------- - * Layer 1 (Fn1) - * ------------------------------------------ --------------------------------------- - * | 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 | 6 | 7 | 8 | 9 | 0 | | F12 | < | ' | ¨ | + | Shift | - * -----------------------| Alt | Spc | Fn1 | | BSpc| AltGr | |------------------ - * ------------------- --------------------- - * Layer 2 (Fn2) - * ------------------------------------------ --------------------------------------- - * | Tab/Fn2 | F13 | F14 | F15 | F16 | F17 | | ML | MD | MU | MR | MWU | CpsLk | - * | Ctrl/Esc | Prev| Play| Next| M1 | M2 | | Left| Down| Up |Right| MWD | F18 | - * | Shift | § | Del | F19 | F20 | M3 | | Home| PgD | PgU | End | Ins | Shift | - * -----------------------| Alt | Spc | Fn1 | | | | |-------------------- + * ------------------------------------------ ------------------------------------- + * | Tab | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | MWU | Next| + * | Ctrl/Esc | F17 | F18 | F19 | M1 | M2 | | Left| Down| Up |Right| MWD | Play| + * | Shift | ESC | Del | CLk | F20 | M3 | | Home| PgD | PgU | End | Ins | Fn2 | + * -----------------------| Alt | Win | Fn1 | | | | |------------------ * ------------------- ------------------- * Features: * @@ -210,22 +188,22 @@ Button buttons_old[NBR_OF_BUTTONS] = 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}, - {2, KEY_Q, NO_KEY, KEY_F1, KEY_F13, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {3, KEY_W, NO_KEY, KEY_F2, KEY_F14, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {4, KEY_E, NO_KEY, KEY_F3, KEY_F15, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {5, KEY_R, NO_KEY, KEY_F4, KEY_F16, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {6, KEY_T, NO_KEY, KEY_F5, KEY_F17, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {1, KEY_FN2, NO_KEY, KEY_TAB, KEY_TAB, 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, KEY_ML, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {8, KEY_U, NO_KEY, KEY_F7, KEY_MD, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {9, KEY_I, NO_KEY, KEY_F8, KEY_MU, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {10, KEY_O, NO_KEY, KEY_F9, KEY_MR, 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}, + {12, 'å', NO_KEY, KEY_F11, KEY_MEDIA_NEXT_TRACK, 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}, - {14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {15, KEY_S, NO_KEY, KEY_2, KEY_MEDIA_PLAY_PAUSE, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {16, KEY_D, NO_KEY, KEY_3, KEY_MEDIA_NEXT_TRACK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {14, KEY_A, NO_KEY, KEY_1, KEY_F17, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {15, KEY_S, NO_KEY, KEY_2, KEY_F18, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {16, KEY_D, NO_KEY, KEY_3, KEY_F19, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {17, KEY_F, NO_KEY, KEY_4, KEY_M1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {18, KEY_G, NO_KEY, KEY_5, KEY_M2, 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}, @@ -233,21 +211,21 @@ Button buttons[NBR_OF_BUTTONS] = {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_MWD, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {24, 'ä', NO_KEY, KEY_EQUAL, KEY_F18, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {24, 'ä', NO_KEY, '§', KEY_MEDIA_PLAY_PAUSE, 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, '§', false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {26, KEY_Z, NO_KEY, KEY_6, KEY_ESC, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {27, KEY_X, NO_KEY, KEY_7, KEY_DELETE, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {28, KEY_C, NO_KEY, KEY_8, KEY_F19, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {28, KEY_C, NO_KEY, KEY_8, KEY_CAPS_LOCK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {29, KEY_V, NO_KEY, KEY_9, KEY_F20, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {30, KEY_B, NO_KEY, KEY_0, KEY_M3, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {31, KEY_N, NO_KEY, KEY_F12, KEY_HOME, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {32, KEY_M, NO_KEY, '<', KEY_PAGE_DOWN, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {31, KEY_N, NO_KEY, '<', KEY_HOME, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, + {32, KEY_M, NO_KEY, KEY_EQUAL, KEY_PAGE_DOWN, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {33, KEY_COMMA, NO_KEY, KEY_BACKSLASH, KEY_PAGE_UP, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {34, KEY_PERIOD, NO_KEY, KEY_RIGHT_BRACE, KEY_END, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {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}, + {36, KEY_FN2, NO_KEY, KEY_FN2, KEY_FN2, 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_SPACE, 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}, {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},