localhots/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge pull request #1010 from SjB/oneshot_timeout_fix

Browse Source 
oneshot timeout would only timeout after an event.
This commit is contained in:
Jack Humbert 2017-02-06 18:57:23 -05:00 committed by GitHub
commit b6ffda4849
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tmk_core/common/action.c
View File

@ -49,6 +49,13 @@ void action_exec(keyevent_t event)
keyrecord_t record = { .event = event }; keyrecord_t record = { .event = event };
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
if (has_oneshot_layer_timed_out()) {
dprintf("Oneshot layer: timeout\n");
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
}
#endif
#ifndef NO_ACTION_TAPPING #ifndef NO_ACTION_TAPPING
action_tapping_process(record); action_tapping_process(record);
#else #else
@ -100,7 +107,7 @@ bool process_record_quantum(keyrecord_t *record) {
return true; return true;
} }
void process_record(keyrecord_t *record) void process_record(keyrecord_t *record)
{ {
if (IS_NOEVENT(record->event)) { return; } if (IS_NOEVENT(record->event)) { return; }
@ -126,13 +133,6 @@ void process_action(keyrecord_t *record, action_t action)
uint8_t tap_count = record->tap.count; uint8_t tap_count = record->tap.count;
#endif #endif
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
if (has_oneshot_layer_timed_out()) {
dprintf("Oneshot layer: timeout\n");
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
}
#endif
if (event.pressed) { if (event.pressed) {
// clear the potential weak mods left by previously pressed keys // clear the potential weak mods left by previously pressed keys
clear_weak_mods(); clear_weak_mods();