diff options
author | Giuseppe Rota <rota.giuseppe@gmail.com> | 2018-12-29 15:48:01 +0100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-12-30 08:35:12 -0800 |
commit | 3ddec14eb8c1b666df381573c6db8a4b2fda035f (patch) | |
tree | b477d5a530984e49fd797243d24edd7103410307 | |
parent | 46b4b4407ff6e23d0799b0f902e61f1fe3645a9a (diff) | |
download | qmk_firmware-3ddec14eb8c1b666df381573c6db8a4b2fda035f.tar.gz qmk_firmware-3ddec14eb8c1b666df381573c6db8a4b2fda035f.zip |
Register the interrupting keycode in the tap dance state struct
-rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index b55ace5ba..16d33ddde 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
@@ -131,6 +131,7 @@ void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) { | |||
131 | if (keycode == action->state.keycode && keycode == last_td) | 131 | if (keycode == action->state.keycode && keycode == last_td) |
132 | continue; | 132 | continue; |
133 | action->state.interrupted = true; | 133 | action->state.interrupted = true; |
134 | action->state.interrupting_keycode = keycode; | ||
134 | process_tap_dance_action_on_dance_finished (action); | 135 | process_tap_dance_action_on_dance_finished (action); |
135 | reset_tap_dance (&action->state); | 136 | reset_tap_dance (&action->state); |
136 | } | 137 | } |
@@ -209,5 +210,6 @@ void reset_tap_dance (qk_tap_dance_state_t *state) { | |||
209 | state->count = 0; | 210 | state->count = 0; |
210 | state->interrupted = false; | 211 | state->interrupted = false; |
211 | state->finished = false; | 212 | state->finished = false; |
213 | state->interrupting_keycode = 0; | ||
212 | last_td = 0; | 214 | last_td = 0; |
213 | } | 215 | } |
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index 8b0a47c49..ca12f4746 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h | |||
@@ -27,6 +27,7 @@ typedef struct | |||
27 | uint8_t oneshot_mods; | 27 | uint8_t oneshot_mods; |
28 | uint8_t weak_mods; | 28 | uint8_t weak_mods; |
29 | uint16_t keycode; | 29 | uint16_t keycode; |
30 | uint16_t interrupting_keycode; | ||
30 | uint16_t timer; | 31 | uint16_t timer; |
31 | bool interrupted; | 32 | bool interrupted; |
32 | bool pressed; | 33 | bool pressed; |