diff options
| author | scauligi <scauligi@eng.ucsd.edu> | 2018-02-04 10:45:19 -0800 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-02-04 13:45:19 -0500 |
| commit | 9fcda95363568156887c76867e843a86f8f75757 (patch) | |
| tree | d9677c75a66589f5a32453003ba814458bb50b8e /quantum/process_keycode/process_tap_dance.h | |
| parent | 2908c0f9277d021d35133940d6a4d77569229ecf (diff) | |
Fixes to get tap dance to fire at proper places (#2272)
* tap dance fixes: fire immediately upon completion and also get properly interrupted before macros
* bugfix for tapdance improvement
* fix build
Diffstat (limited to 'quantum/process_keycode/process_tap_dance.h')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index ab20ea04ed..8b0a47c49b 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -62,12 +62,12 @@ typedef struct } qk_tap_dance_dual_role_t; #define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) { \ - .fn = { NULL, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset }, \ + .fn = { qk_tap_dance_pair_on_each_tap, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset }, \ .user_data = (void *)&((qk_tap_dance_pair_t) { kc1, kc2 }), \ } #define ACTION_TAP_DANCE_DUAL_ROLE(kc, layer) { \ - .fn = { NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset }, \ + .fn = { qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset }, \ .user_data = (void *)&((qk_tap_dance_dual_role_t) { kc, layer }), \ } @@ -91,13 +91,16 @@ extern qk_tap_dance_action_t tap_dance_actions[]; /* To be used internally */ +void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record); bool process_tap_dance(uint16_t keycode, keyrecord_t *record); void matrix_scan_tap_dance (void); void reset_tap_dance (qk_tap_dance_state_t *state); +void qk_tap_dance_pair_on_each_tap (qk_tap_dance_state_t *state, void *user_data); void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data); void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data); +void qk_tap_dance_dual_role_on_each_tap (qk_tap_dance_state_t *state, void *user_data); void qk_tap_dance_dual_role_finished (qk_tap_dance_state_t *state, void *user_data); void qk_tap_dance_dual_role_reset (qk_tap_dance_state_t *state, void *user_data); |