diff options
author | Xyverz <xyverz@gmail.com> | 2016-08-17 23:53:56 -0700 |
---|---|---|
committer | Xyverz <xyverz@gmail.com> | 2016-08-17 23:53:56 -0700 |
commit | 385b827c858d492e8ebafd85bac32ab738292d41 (patch) | |
tree | 169024032cff358909387b08ad31fed4ceee8617 /quantum/process_keycode/process_tap_dance.h | |
parent | 5c5c3e626b7f2e4a5835988c069c7154f347c4ca (diff) | |
parent | 8144ce8852f690d5772d80ed2b96ae4af201e266 (diff) |
Merge remote-tracking branch 'upstream/master'
this merge is necessary,
Diffstat (limited to 'quantum/process_keycode/process_tap_dance.h')
-rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index 6a1258067e..d7b857bdc6 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -11,8 +11,9 @@ typedef struct uint8_t count; uint16_t keycode; uint16_t timer; - bool active:1; - bool pressed:1; + bool interrupted; + bool pressed; + bool finished; } qk_tap_dance_state_t; #define TD(n) (QK_TAP_DANCE + n) @@ -26,6 +27,7 @@ typedef struct qk_tap_dance_user_fn_t on_dance_finished; qk_tap_dance_user_fn_t on_reset; } fn; + qk_tap_dance_state_t state; void *user_data; } qk_tap_dance_action_t; @@ -48,8 +50,7 @@ typedef struct .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset } \ } -extern const qk_tap_dance_action_t tap_dance_actions[]; -extern bool td_debug_enable; +extern qk_tap_dance_action_t tap_dance_actions[]; /* To be used internally */ |