Improved realese mechanism for keys. Improved key assignment
This commit is contained in:
parent
47159c1e4a
commit
f32fb49178
@ -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 | AltGr | Win |--------------------
|
||||||
* -------------------------- -------------------------
|
* ------------------------- -------------------------
|
||||||
* Layer 1
|
* 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 | | | < | ' | ¨ | + | Shift/Enter |
|
* | Shift | 6 | 7 | 8 | 9 | 0 | | F18 | < | ' | ¨ | + | Shift/Enter |
|
||||||
* ----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |--------------------
|
* -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |--------------------
|
||||||
* -------------------------- -------------------------
|
* ------------------------- -------------------------
|
||||||
* Layer 2
|
* Layer 2 (Fn2)
|
||||||
* ------------------------------------------ ---------------------------------------------
|
* ------------------------------------------ ---------------------------------------------
|
||||||
* | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | MWU | CapsLock |
|
* | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | MWU | CapsLock |
|
||||||
* | Ctrl/Esc | Prev| Play| Next| M1 | M2 | | Left| Down| Up |Right| MWD | |
|
* | Ctrl/Esc | Prev| Play| Next| M1 | M2 | | Left| Down| Up |Right| MWD | PrtSc |
|
||||||
* | Shift | § | Del | | | M3 | | Home| PgD | PgU | End | Ins | Shift/Enter |
|
* | Shift | § | Del | F17 | SCE | M3 | | Home| PgD | PgU | End | Ins | Shift/Enter |
|
||||||
* ----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |--------------------
|
* -----------------| Alt | Spc | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |--------------------
|
||||||
* -------------------------- -------------------------
|
* ------------------------- -------------------------
|
||||||
*
|
*
|
||||||
* Features:
|
* Features:
|
||||||
*
|
*
|
||||||
@ -59,8 +59,8 @@
|
|||||||
* * Function keys with total of four layer support (Primary + 2fn layers + Game mode).
|
* * Function keys with total of four layer support (Primary + 2fn layers + Game mode).
|
||||||
* * Mouse movement, wheel up, wheel down, left button, right button and middle button support
|
* * Mouse movement, wheel up, wheel down, left button, right button and middle button support
|
||||||
* * Status indication -
|
* * Status indication -
|
||||||
* - 0 LED off = Normal mode
|
* - LED off = Normal mode
|
||||||
* - 2 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
|
* * Combo key (up to three simultaneous keys) support. Configurable for each button
|
||||||
*/
|
*/
|
||||||
@ -100,6 +100,7 @@ struct Button
|
|||||||
bool hold_direct = true;
|
bool hold_direct = true;
|
||||||
uint16_t combo_keycode[3] = {NO_KEY, NO_KEY, NO_KEY};
|
uint16_t combo_keycode[3] = {NO_KEY, NO_KEY, NO_KEY};
|
||||||
int kstate = IDLE;
|
int kstate = IDLE;
|
||||||
|
uint16_t last_keycode = NO_KEY;
|
||||||
bool run_keycode = false;
|
bool run_keycode = false;
|
||||||
int tap_state = 0;
|
int tap_state = 0;
|
||||||
bool tap_timeout_enable = false;
|
bool tap_timeout_enable = false;
|
||||||
@ -138,7 +139,6 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS,
|
|||||||
* "Fn1 key" is the layer 1 key to use. Don NOT add KEY_FN1 or KEY_FN2 to this layer.
|
* "Fn1 key" is the layer 1 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.
|
* "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.
|
||||||
* "GM replace key" will override all layer keys (Fn0, Fn1, Fn2) both tap and hold while game mode are active.
|
|
||||||
* "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 */
|
* "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 */
|
||||||
|
|
||||||
@ -146,48 +146,48 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS,
|
|||||||
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 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},
|
{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},
|
||||||
{2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, false, {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, 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, 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},
|
||||||
{4, KEY_E, NO_KEY, KEY_F3, KEY_F14, 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, 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, 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},
|
||||||
{6, KEY_T, NO_KEY, KEY_F5, KEY_F16, 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, 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, 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},
|
||||||
{8, KEY_U, NO_KEY, KEY_F7, KEY_MD, 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, 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, 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},
|
||||||
{10, KEY_O, NO_KEY, KEY_F9, KEY_MR, 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, 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, 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},
|
||||||
{12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, 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, 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, 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},
|
||||||
{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},
|
{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},
|
||||||
{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},
|
{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},
|
||||||
{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},
|
{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},
|
||||||
{17, KEY_F, NO_KEY, KEY_4, KEY_M1, 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, 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, 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},
|
||||||
{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},
|
{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},
|
||||||
{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},
|
{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},
|
||||||
{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},
|
{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},
|
||||||
{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},
|
{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},
|
||||||
{23, 'ö', NO_KEY, KEY_0, KEY_MWD, 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, NO_KEY, 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},
|
{24, 'ä', NO_KEY, KEY_EQUAL, KEY_PRINTSCREEN, 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, {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, NO_KEY, 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},
|
{26, KEY_Z, NO_KEY, KEY_6, '§', 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, {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, NO_KEY, 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},
|
{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},
|
||||||
{29, KEY_V, NO_KEY, KEY_9, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, 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},
|
||||||
{30, KEY_B, NO_KEY, KEY_0, KEY_M3, 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, NO_KEY, 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},
|
{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},
|
||||||
{32, KEY_M, NO_KEY, '<', KEY_PAGE_DOWN, 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, 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, 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},
|
||||||
{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},
|
{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},
|
||||||
{35, KEY_SLASH, NO_KEY, KEY_MINUS, KEY_INSERT, 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, 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, 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},
|
||||||
{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},
|
{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},
|
||||||
{38, KEY_SPACE, NO_KEY, KEY_SPACE, KEY_SPACE, 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, 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, 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},
|
||||||
{40, KEY_FN1, KEY_SPACE, 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, 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, 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},
|
||||||
{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}};
|
{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}};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
/* End of keymap config -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
|
/* End of keymap config -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
|
||||||
|
|
||||||
@ -495,10 +495,12 @@ void scan_buttons()
|
|||||||
{
|
{
|
||||||
set_key(buttons[i].combo_keycode[j], PRESSED);
|
set_key(buttons[i].combo_keycode[j], PRESSED);
|
||||||
}
|
}
|
||||||
|
buttons[i].last_keycode = KEY_COMBO;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
set_key(buttons[i].fn1_keycode, PRESSED);
|
set_key(buttons[i].fn1_keycode, PRESSED);
|
||||||
|
buttons[i].last_keycode = buttons[i].fn1_keycode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (fn_mode == 2)
|
else if (fn_mode == 2)
|
||||||
@ -510,10 +512,12 @@ void scan_buttons()
|
|||||||
{
|
{
|
||||||
set_key(buttons[i].combo_keycode[j], PRESSED);
|
set_key(buttons[i].combo_keycode[j], PRESSED);
|
||||||
}
|
}
|
||||||
|
buttons[i].last_keycode = KEY_COMBO;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
set_key(buttons[i].fn2_keycode, PRESSED);
|
set_key(buttons[i].fn2_keycode, PRESSED);
|
||||||
|
buttons[i].last_keycode = buttons[i].fn2_keycode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -525,10 +529,12 @@ void scan_buttons()
|
|||||||
{
|
{
|
||||||
set_key(buttons[i].combo_keycode[j], PRESSED);
|
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);
|
||||||
|
buttons[i].last_keycode = buttons[i].keycode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -559,16 +565,19 @@ void scan_buttons()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Sending release command for all combo keys */
|
if (buttons[i].last_keycode == KEY_COMBO)
|
||||||
for (int j = 0; j < 3; j++)
|
|
||||||
{
|
{
|
||||||
set_key(buttons[i].combo_keycode[j], RELEASED);
|
/* 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 */
|
||||||
|
set_key(buttons[i].last_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 */
|
/* Reset run_keycode flag */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user