diff options
| author | Joe Wasson <joe@talljoe.com> | 2018-07-04 17:01:16 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-07-15 13:29:59 -0400 |
| commit | 81756d7b219fc2c869c043ee606d491a1e77e1c1 (patch) | |
| tree | 52946fef8d0105eba128e040f96025095907939b | |
| parent | c5c112ae2927d2d026de16cc4cdfd692bb6e7ab9 (diff) | |
| download | qmk_firmware-81756d7b219fc2c869c043ee606d491a1e77e1c1.tar.gz qmk_firmware-81756d7b219fc2c869c043ee606d491a1e77e1c1.zip | |
Fix tapdance when one-shot is disabled.
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 94dd17c2f..833780691 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
| @@ -16,7 +16,9 @@ | |||
| 16 | #include "quantum.h" | 16 | #include "quantum.h" |
| 17 | #include "action_tapping.h" | 17 | #include "action_tapping.h" |
| 18 | 18 | ||
| 19 | #ifndef NO_ACTION_ONESHOT | ||
| 19 | uint8_t get_oneshot_mods(void); | 20 | uint8_t get_oneshot_mods(void); |
| 21 | #endif | ||
| 20 | 22 | ||
| 21 | static uint16_t last_td; | 23 | static uint16_t last_td; |
| 22 | static int8_t highest_td = -1; | 24 | static int8_t highest_td = -1; |
| @@ -146,7 +148,11 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { | |||
| 146 | action->state.keycode = keycode; | 148 | action->state.keycode = keycode; |
| 147 | action->state.count++; | 149 | action->state.count++; |
| 148 | action->state.timer = timer_read(); | 150 | action->state.timer = timer_read(); |
| 151 | #ifndef NO_ACTION_ONESHOT | ||
| 149 | action->state.oneshot_mods = get_oneshot_mods(); | 152 | action->state.oneshot_mods = get_oneshot_mods(); |
| 153 | #else | ||
| 154 | action->state.oneshot_mods = 0; | ||
| 155 | #endif | ||
| 150 | action->state.weak_mods = get_mods(); | 156 | action->state.weak_mods = get_mods(); |
| 151 | action->state.weak_mods |= get_weak_mods(); | 157 | action->state.weak_mods |= get_weak_mods(); |
| 152 | process_tap_dance_action_on_each_tap (action); | 158 | process_tap_dance_action_on_each_tap (action); |
