diff options
author | Ole Anders <[email protected]> | 2017-03-07 19:39:00 +0100 |
---|---|---|
committer | Ole Anders <[email protected]> | 2017-03-07 19:39:00 +0100 |
commit | 25a7c941746d077d246468bec6bebdb01e478090 (patch) | |
tree | 906b491bb1465be287ec4dc02e9857437f7582a6 /tmk_core/common/action.c | |
parent | d1fb51976aeef8eeea5975c5bf75b6b1aa649826 (diff) | |
parent | f5c8c5d4c854c5ae4dc586066c9b03557786c4c2 (diff) | |
download | qmk_firmware-25a7c941746d077d246468bec6bebdb01e478090.tar.gz qmk_firmware-25a7c941746d077d246468bec6bebdb01e478090.zip |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'tmk_core/common/action.c')
-rw-r--r-- | tmk_core/common/action.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index d485b46c77..f03670a7f7 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -49,6 +49,13 @@ void action_exec(keyevent_t 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 action_tapping_process(record); #else @@ -100,7 +107,7 @@ bool process_record_quantum(keyrecord_t *record) { return true; } -void process_record(keyrecord_t *record) +void process_record(keyrecord_t *record) { 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; #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) { // clear the potential weak mods left by previously pressed keys clear_weak_mods(); |