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_space_cadet.c | |
| parent | fd7ab5a22bd5ba85dde3a5da54856784bfb19120 (diff) | |
| parent | 810eafad121bda333c53490e2d8a29f3a83d9c19 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/process_keycode/process_space_cadet.c')
| -rw-r--r-- | quantum/process_keycode/process_space_cadet.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/quantum/process_keycode/process_space_cadet.c b/quantum/process_keycode/process_space_cadet.c index bcaf62a964..f99db2a87b 100644 --- a/quantum/process_keycode/process_space_cadet.c +++ b/quantum/process_keycode/process_space_cadet.c @@ -16,10 +16,6 @@ #include "process_space_cadet.h" #include "action_tapping.h" -#ifdef NO_ACTION_TAPPING -__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { return TAPPING_TERM; }; -#endif - // ********** OBSOLETE DEFINES, STOP USING! (pls?) ********** // Shift / paren setup #ifndef LSPO_KEY @@ -97,7 +93,12 @@ void perform_space_cadet(keyrecord_t *record, uint16_t sc_keycode, uint8_t holdM register_mods(MOD_BIT(holdMod)); } } else { - if (sc_last == holdMod && timer_elapsed(sc_timer) < get_tapping_term(sc_keycode, record)) { +#ifdef TAPPING_TERM_PER_KEY + if (sc_last == holdMod && timer_elapsed(sc_timer) < get_tapping_term(sc_keycode, record)) +#else + if (sc_last == holdMod && timer_elapsed(sc_timer) < TAPPING_TERM) +#endif + { if (holdMod != tapMod) { if (IS_MOD(holdMod)) { unregister_mods(MOD_BIT(holdMod)); |