diff options
| author | Drashna Jaelre <drashna@live.com> | 2020-07-24 20:05:27 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-08-29 14:30:02 -0700 |
| commit | 9d3b26a47543d9898a2af2cee5f6ef53b4995e9f (patch) | |
| tree | 934d032d2cdbb13c2223aa59ab854428407d5092 /quantum/process_keycode/process_tap_dance.c | |
| parent | 3c74edbc691502228b2d2c4d42d5888311f0ca4c (diff) | |
| download | qmk_firmware-9d3b26a47543d9898a2af2cee5f6ef53b4995e9f.tar.gz qmk_firmware-9d3b26a47543d9898a2af2cee5f6ef53b4995e9f.zip | |
Update features to use Custom Tapping Term when appropriate (#6259)
* Update Space Cadet to use Custom Tapping Term functionality
* Detect correct keycode for space cadet tapping term
* Update tap dancing to use global custom tapping term
* Update documentation for Tap Dances
* formatting pass
* Apply suggestions from code review
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update docs/feature_tap_dance.md
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update for future
* Update user keymaps for space cadet
* Fix typos
* Clean up tapping term stuff
* Fix compiler issue if NO_ACTION_TAPPING is enabled
Co-authored-by: fauxpark <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'quantum/process_keycode/process_tap_dance.c')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 16756e59c..0c7b6353e 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
| @@ -16,10 +16,6 @@ | |||
| 16 | #include "quantum.h" | 16 | #include "quantum.h" |
| 17 | #include "action_tapping.h" | 17 | #include "action_tapping.h" |
| 18 | 18 | ||
| 19 | #ifndef TAPPING_TERM | ||
| 20 | # define TAPPING_TERM 200 | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #ifndef NO_ACTION_ONESHOT | 19 | #ifndef NO_ACTION_ONESHOT |
| 24 | uint8_t get_oneshot_mods(void); | 20 | uint8_t get_oneshot_mods(void); |
| 25 | #endif | 21 | #endif |
| @@ -171,7 +167,7 @@ void matrix_scan_tap_dance() { | |||
| 171 | if (action->custom_tapping_term > 0) { | 167 | if (action->custom_tapping_term > 0) { |
| 172 | tap_user_defined = action->custom_tapping_term; | 168 | tap_user_defined = action->custom_tapping_term; |
| 173 | } else { | 169 | } else { |
| 174 | tap_user_defined = TAPPING_TERM; | 170 | tap_user_defined = get_tapping_term(action->state.keycode, NULL); |
| 175 | } | 171 | } |
| 176 | if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) { | 172 | if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) { |
| 177 | process_tap_dance_action_on_dance_finished(action); | 173 | process_tap_dance_action_on_dance_finished(action); |
