diff options
author | Drashna Jaelre <drashna@live.com> | 2021-01-04 16:37:20 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-04 16:37:20 -0800 |
commit | 810eafad121bda333c53490e2d8a29f3a83d9c19 (patch) | |
tree | 975b8bd9c846d13f30da944e873326e0e0f69fa8 /quantum/process_keycode/process_tap_dance.c | |
parent | c38fe492426676cf101eeb024f7f33d8e98c445f (diff) | |
download | qmk_firmware-810eafad121bda333c53490e2d8a29f3a83d9c19.tar.gz qmk_firmware-810eafad121bda333c53490e2d8a29f3a83d9c19.zip |
Fix Tap-Hold Configs (#11127)
* Add proper prototypes for Tap-Hold Per Key functions
* Fix handwired/tennie default keymap
* Remove unneeded references
* Fix tapping term per key check in space cadet
* Pre-emptive fix for tap dance
* Fix marksard/leftover30
* Replace hard coded tapping term with define
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 0c7b6353e..138de0eba 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
@@ -14,7 +14,6 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | #include "quantum.h" | 16 | #include "quantum.h" |
17 | #include "action_tapping.h" | ||
18 | 17 | ||
19 | #ifndef NO_ACTION_ONESHOT | 18 | #ifndef NO_ACTION_ONESHOT |
20 | uint8_t get_oneshot_mods(void); | 19 | uint8_t get_oneshot_mods(void); |
@@ -167,7 +166,11 @@ void matrix_scan_tap_dance() { | |||
167 | if (action->custom_tapping_term > 0) { | 166 | if (action->custom_tapping_term > 0) { |
168 | tap_user_defined = action->custom_tapping_term; | 167 | tap_user_defined = action->custom_tapping_term; |
169 | } else { | 168 | } else { |
169 | #ifdef TAPPING_TERM_PER_KEY | ||
170 | tap_user_defined = get_tapping_term(action->state.keycode, NULL); | 170 | tap_user_defined = get_tapping_term(action->state.keycode, NULL); |
171 | #else | ||
172 | tap_user_defined = TAPPING_TERM; | ||
173 | #endif | ||
171 | } | 174 | } |
172 | if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) { | 175 | if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) { |
173 | process_tap_dance_action_on_dance_finished(action); | 176 | process_tap_dance_action_on_dance_finished(action); |