diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
| commit | 2bb2977c133646c4e056960e72029270d77cc1eb (patch) | |
| tree | 235d491f992121ac1716c5bf2fafb80983748576 /quantum/process_keycode/process_tap_dance.h | |
| parent | a55c838961c89097ab849ed6cb1f261791e6b9b4 (diff) | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| download | qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.gz qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.zip | |
Merge branch 'master' into debounce_refactor
# Conflicts:
# tmk_core/common/keyboard.c
Diffstat (limited to 'quantum/process_keycode/process_tap_dance.h')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |