diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-05 00:37:55 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-05 00:37:55 +0000 |
| commit | d0aa9ff972e7e438d1a5fa2baa4b35db91c8a070 (patch) | |
| tree | 9da864d1811a6fc892a346cd3fe8b900f816709c /quantum/process_keycode/process_tap_dance.c | |
| parent | fd7ab5a22bd5ba85dde3a5da54856784bfb19120 (diff) | |
| parent | 810eafad121bda333c53490e2d8a29f3a83d9c19 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/process_keycode/process_tap_dance.c')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 0c7b6353eb..138de0eba2 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "quantum.h" -#include "action_tapping.h" #ifndef NO_ACTION_ONESHOT uint8_t get_oneshot_mods(void); @@ -167,7 +166,11 @@ void matrix_scan_tap_dance() { if (action->custom_tapping_term > 0) { tap_user_defined = action->custom_tapping_term; } else { +#ifdef TAPPING_TERM_PER_KEY tap_user_defined = get_tapping_term(action->state.keycode, NULL); +#else + tap_user_defined = TAPPING_TERM; +#endif } if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) { process_tap_dance_action_on_dance_finished(action); |