Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combo TAP_CODE_DELAY and clear_weak_mods #15866

Merged
merged 3 commits into from
Jan 29, 2022
Merged

Combo TAP_CODE_DELAY and clear_weak_mods #15866

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d596e7
Add TAP_CODE_DELAY after combo buffer dump.
sevanteri Jan 13, 2022
de9d151
Clear weak mods after dumping keys from combo buffer.
sevanteri Jan 13, 2022
51a46f6
Only delay once and for a non-tapping key.
sevanteri Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions quantum/process_keycode/process_combo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "print.h"
#include "process_combo.h"
#include "action_tapping.h"
#include "action.h"

#ifdef COMBO_COUNT
__attribute__((weak)) combo_t key_combos[COMBO_COUNT];
Expand Down Expand Up @@ -193,6 +194,9 @@ void clear_combos(void) {
static inline void dump_key_buffer(void) {
/* First call start from 0 index; recursive calls need to start from i+1 index */
static uint8_t key_buffer_next = 0;
#if TAP_CODE_DELAY > 0
bool delay_done = false;
#endif

if (key_buffer_size == 0) {
return;
Expand All @@ -218,6 +222,15 @@ static inline void dump_key_buffer(void) {
#endif
}
record->event.time = 0;
clear_weak_mods();

#if TAP_CODE_DELAY > 0
// only delay once and for a non-tapping key
if (!delay_done && !is_tap_record(record)) {
delay_done = true;
wait_ms(TAP_CODE_DELAY);
}
#endif
}

key_buffer_next = key_buffer_size = 0;
Expand Down