cm/cmdr-keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed combokeys. Streamlined code

Browse Source
This commit is contained in:
Christoffer Martinsson 2022-11-08 06:51:39 +01:00
parent 52c9bf9065
commit bfcfff7859
1 changed files with 93 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
firmware/src/main.cpp
View File

@ -34,22 +34,22 @@
* | Tab/Fn2 | Q | W | E | R | T | | Y | U | I | O | P | Å | * | Tab/Fn2 | Q | W | E | R | T | | Y | U | I | O | P | Å |
* | Ctrl/Esc | A | S | D | F | G | | H | J | K | L | Ö | Ä | * | Ctrl/Esc | A | S | D | F | G | | H | J | K | L | Ö | Ä |
* | Shift | Z | X | C | V | B | | N | M | , | . | - | Shift/Enter | * | Shift | Z | X | C | V | B | | N | M | , | . | - | Shift/Enter |
* -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- * -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | Fn1+AltGr | Win |----------------
* ------------------------- ------------------------- * ------------------------- -----------------------------
* Layer 1 (Fn1) * Layer 1 (Fn1)
* ------------------------------------------ --------------------------------------------- * ------------------------------------------ ---------------------------------------------
* | Tab/Fn2 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | * | 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 | ´ | * | Ctrl/Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ´ |
* | Shift | 6 | 7 | 8 | 9 | 0 | | F18 | < | ' | ¨ | + | Shift/Enter | * | Shift | 6 | 7 | 8 | 9 | 0 | | F12 | < | ' | ¨ | + | Shift/Enter |
* -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- * -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | Fn1+AltGr | Win |----------------
* ------------------------- ------------------------- * ------------------------- -----------------------------
* Layer 2 (Fn2) * Layer 2 (Fn2)
* ------------------------------------------ --------------------------------------------- * ------------------------------------------ ---------------------------------------------
* | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | MWU | CapsLock | * | 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 | PrtSc | * | Ctrl/Esc | Prev| Play| Next| M1 | M2 | | Left| Down| Up |Right| MWD | F18 |
* | Shift | § | Del | F17 | SCE | M3 | | Home| PgD | PgU | End | Ins | Shift/Enter | * | Shift | § | Del | F19 | F20 | M3 | | Home| PgD | PgU | End | Ins | Shift/Enter |
* -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |-------------------- * -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | Fn1+AltGr | Win |----------------
* ------------------------- ------------------------- * ------------------------- -----------------------------
* *
* Features: * Features:
* *
@ -62,7 +62,6 @@
* - LED off = Normal mode * - LED off = Normal mode
* - LED flashing = Caps Lock activated * - LED flashing = Caps Lock activated
* * Tap/Hold functionality (only for layer0) * * Tap/Hold functionality (only for layer0)
* * Combo key (up to three simultaneous keys) support. Configurable for each button
*/ */
#include <Arduino.h> #include <Arduino.h>
@ -85,9 +84,8 @@
#define KEY_MR 9 + KEY_OFFSET // Mouse X+ #define KEY_MR 9 + KEY_OFFSET // Mouse X+
#define KEY_FN1 10 + KEY_OFFSET // Function layer 1 button #define KEY_FN1 10 + KEY_OFFSET // Function layer 1 button
#define KEY_FN2 11 + KEY_OFFSET // Function layer 2 button #define KEY_FN2 11 + KEY_OFFSET // Function layer 2 button
#define KEY_COMBO 12 + KEY_OFFSET // Combo key (pressing all key defined in combo array)
#define TAP_TIMEOUT 140 // Key tap timeout (ms) #define TAP_TIMEOUT 150 // Key tap timeout (ms)
#define NBR_OF_BUTTONS 42 // Number of buttons used (42 in this case) #define NBR_OF_BUTTONS 42 // Number of buttons used (42 in this case)
struct Button struct Button
@ -98,7 +96,6 @@ struct Button
uint16_t fn1_keycode = NO_KEY; uint16_t fn1_keycode = NO_KEY;
uint16_t fn2_keycode = NO_KEY; uint16_t fn2_keycode = NO_KEY;
bool hold_direct = true; bool hold_direct = true;
uint16_t combo_keycode[3] = {NO_KEY, NO_KEY, NO_KEY};
int kstate = IDLE; int kstate = IDLE;
uint16_t last_keycode = NO_KEY; uint16_t last_keycode = NO_KEY;
bool run_keycode = false; bool run_keycode = false;
@ -124,9 +121,9 @@ char kp_keys[KP_ROWS][KP_COLS] = {
Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, KP_COLS); Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, KP_COLS);
/* 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 /* 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
* "Button ID" corresponding with the physical design of the actual keyboard. DO NOT CHANGE BTN ID! * "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 | | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 1O | 11 | 12 |
@ -140,56 +137,57 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS,
* "Fn2 key" is the layer 2 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. "Fn1 key" and "Fn2 key" are N/A when using tap mode and should me defined as NO_KEY.
* "Hold direct" enables sending PRESS command as soon as the hold key is pressed (regardless if you intend to press the tap key). * "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 */
/* Keymap config ----------------------------------------------------------------------------------------------------------------------------------- */
// clang-format off // clang-format off
Button buttons[NBR_OF_BUTTONS] = Button buttons[NBR_OF_BUTTONS] =
{ {
/* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key Hold direct Combo keys */ /* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key Hold direct */
{1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {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_F12, false, {NO_KEY, NO_KEY, NO_KEY}, 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_F13, false, {NO_KEY, NO_KEY, NO_KEY}, 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_F14, false, {NO_KEY, NO_KEY, NO_KEY}, 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_F15, false, {NO_KEY, NO_KEY, NO_KEY}, 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_F16, false, {NO_KEY, NO_KEY, NO_KEY}, 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},
{7, KEY_Y, NO_KEY, KEY_F6, KEY_ML, false, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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},
{17, KEY_F, NO_KEY, KEY_4, KEY_M1, false, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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_PRINTSCREEN, false, {NO_KEY, NO_KEY, NO_KEY}, 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},
{25, KEY_LEFT_SHIFT, NO_KEY, KEY_LEFT_SHIFT, KEY_LEFT_SHIFT, false, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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},
{27, KEY_X, NO_KEY, KEY_7, KEY_DELETE, false, {NO_KEY, NO_KEY, NO_KEY}, 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_F17, false, {NO_KEY, NO_KEY, NO_KEY}, 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},
{29, KEY_V, NO_KEY, KEY_9, KEY_COMBO, false, {KEY_LEFT_SHIFT, KEY_LEFT_CTRL, KEY_ESC}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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_F18, KEY_HOME, false, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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},
{33, KEY_COMMA, NO_KEY, KEY_BACKSLASH, KEY_PAGE_UP, false, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, {NO_KEY, NO_KEY, NO_KEY}, 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, KEY_ENTER, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {36, KEY_RIGHT_SHIFT, KEY_ENTER, NO_KEY, NO_KEY, true, IDLE, NO_KEY, 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, 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, {NO_KEY, NO_KEY, NO_KEY}, 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},
{39, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {39, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, true, IDLE, NO_KEY, false, 0, false, false, 0, 0, false},
{40, KEY_FN1, KEY_SPACE, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, {40, KEY_FN1, KEY_SPACE, NO_KEY, NO_KEY, true, IDLE, NO_KEY, 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, NO_KEY, false, 0, false, false, 0, 0, false}, {41, KEY_FN1, 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, KEY_LEFT_GUI, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}}; {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, KEY_LEFT_GUI, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}};
// clang-format on // clang-format on
/* End of keymap config -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ /* End of keymap config ----------------------------------------------------------------------------------------------------------------------------- */
const int STATUS_LED = 13; const int STATUS_LED = 13;
bool status_led_on = false; bool status_led_on = false;
@ -220,7 +218,7 @@ bool key_pressed = false;
bool set_key(uint16_t keycode, uint8_t kstate) bool set_key(uint16_t keycode, uint8_t kstate)
{ {
/* Abort if keycode is invalid */ /* Abort if keycode is invalid */
if (keycode == NO_KEY || keycode == KEY_FN1 || keycode == KEY_FN2 || keycode == KEY_COMBO) if (keycode == NO_KEY || keycode == KEY_FN1 || keycode == KEY_FN2)
{ {
return false; return false;
} }
@ -365,12 +363,12 @@ void scan_buttons()
if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar) 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)*/ /* 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)) if (buttons[j].keycode == KEY_FN1)
{ {
fn_mode = 1; fn_mode = 1;
} }
/* Check if FN2 key are defined to this button (Layer 0 and first position in combo array)*/ /* 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)) else if (buttons[j].keycode == KEY_FN2)
{ {
fn_mode = 2; fn_mode = 2;
} }
@ -487,50 +485,15 @@ void scan_buttons()
else else
{ {
if (fn_mode == 1) if (fn_mode == 1)
{
if (buttons[i].fn1_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);
}
buttons[i].last_keycode = KEY_COMBO;
}
else
{ {
set_key(buttons[i].fn1_keycode, PRESSED); set_key(buttons[i].fn1_keycode, PRESSED);
buttons[i].last_keycode = buttons[i].fn1_keycode; buttons[i].last_keycode = buttons[i].fn1_keycode;
} }
}
else if (fn_mode == 2) else if (fn_mode == 2)
{
if (buttons[i].fn2_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);
}
buttons[i].last_keycode = KEY_COMBO;
}
else
{ {
set_key(buttons[i].fn2_keycode, PRESSED); set_key(buttons[i].fn2_keycode, PRESSED);
buttons[i].last_keycode = buttons[i].fn2_keycode; buttons[i].last_keycode = buttons[i].fn2_keycode;
} }
}
else
{
if (buttons[i].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);
}
buttons[i].last_keycode = KEY_COMBO;
}
else else
{ {
set_key(buttons[i].keycode, PRESSED); set_key(buttons[i].keycode, PRESSED);
@ -538,7 +501,6 @@ void scan_buttons()
} }
} }
} }
}
else if (buttons[i].kstate == RELEASED) else if (buttons[i].kstate == RELEASED)
{ {
/* Check if key is in tap mode */ /* Check if key is in tap mode */
@ -564,22 +526,11 @@ void scan_buttons()
} }
} }
else else
{
if (buttons[i].last_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
{ {
/* Sending release command for last keycode related to this button */ /* Sending release command for last keycode related to this button */
set_key(buttons[i].last_keycode, RELEASED); set_key(buttons[i].last_keycode, RELEASED);
} }
} }
}
/* Reset run_keycode flag */ /* Reset run_keycode flag */
buttons[i].run_keycode = false; buttons[i].run_keycode = false;
} }