diff options
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/kinesis/keymap.c | 2 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 122 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 9 | ||||
| -rw-r--r-- | readme.md | 4 | 
5 files changed, 71 insertions, 68 deletions
| diff --git a/keyboards/ergodox/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c index 244bfb51fe..144030e2e9 100644 --- a/keyboards/ergodox/keymaps/algernon/keymap.c +++ b/keyboards/ergodox/keymaps/algernon/keymap.c @@ -853,7 +853,7 @@ void ang_tap_dance_ta_reset (qk_tap_dance_state_t *state, void *user_data) {    td_ta->finished_once = false;  } -const qk_tap_dance_action_t tap_dance_actions[] = { +qk_tap_dance_action_t tap_dance_actions[] = {     [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ang_tap_dance_cln_finished, ang_tap_dance_cln_reset)    ,[CT_MNS] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ang_tap_dance_mns_finished, ang_tap_dance_mns_reset)    ,[CT_TA]  = { diff --git a/keyboards/preonic/keymaps/kinesis/keymap.c b/keyboards/preonic/keymaps/kinesis/keymap.c index 1cd6eb9938..9691be91d9 100644 --- a/keyboards/preonic/keymaps/kinesis/keymap.c +++ b/keyboards/preonic/keymaps/kinesis/keymap.c @@ -123,7 +123,7 @@ void music_scale_user(void)  } -const qk_tap_dance_action_t tap_dance_actions[] = { +qk_tap_dance_action_t tap_dance_actions[] = {    //Tap once for equal, twice for hyper + X (alfred lock)    [TD_EQ_LOCK] = ACTION_TAP_DANCE_DOUBLE(KC_EQL,  HYPR(KC_X)),    //Tap once for minus, twice for time.heals.nothing diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 5429e34383..e152f23508 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -1,18 +1,8 @@  #include "quantum.h" +#include "action_tapping.h" -static qk_tap_dance_state_t qk_tap_dance_state; -bool td_debug_enable = false; - -#if CONSOLE_ENABLE -#define td_debug(s) if (td_debug_enable) \ -    { \ -      xprintf ("D:tap_dance:%s:%s = { keycode = %d, count = %d, active = %d, pressed = %d }\n", __FUNCTION__, s, \ -               qk_tap_dance_state.keycode, qk_tap_dance_state.count, \ -               qk_tap_dance_state.active, qk_tap_dance_state.pressed);  \ -    } -#else -#define td_debug(s) -#endif +static uint16_t last_td; +static int8_t highest_td = -1;  void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data) {    qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; @@ -35,98 +25,110 @@ void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data) {  }  static inline void _process_tap_dance_action_fn (qk_tap_dance_state_t *state, -                                          void *user_data, -                                          qk_tap_dance_user_fn_t fn) +                                                 void *user_data, +                                                 qk_tap_dance_user_fn_t fn)  {    if (fn) {      fn(state, user_data);    }  } -static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t action) +static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t *action)  { -  td_debug("trigger"); -  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_each_tap); +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_each_tap);  } -static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_action_t action) +static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_action_t *action)  { -  td_debug("trigger"); -  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_dance_finished); +  if (action->state.finished) +    return; +  action->state.finished = true; +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_dance_finished);  } -static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t action) +static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t *action)  { -  td_debug("trigger") -  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_reset); +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_reset);  }  bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { -  bool r = true;    uint16_t idx = keycode - QK_TAP_DANCE; -  qk_tap_dance_action_t action; +  qk_tap_dance_action_t *action; + +  if (last_td && last_td != keycode) { +    (&tap_dance_actions[last_td - QK_TAP_DANCE])->state.interrupted = true; +  }    switch(keycode) {    case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: -    action = tap_dance_actions[idx]; - -    process_tap_dance_action_on_each_tap (action); -    if (qk_tap_dance_state.keycode && qk_tap_dance_state.keycode != keycode) { -      process_tap_dance_action_on_dance_finished (action); -    } else if (qk_tap_dance_state.active && qk_tap_dance_state.pressed) { -      reset_tap_dance (&qk_tap_dance_state); -    } else { -      r = false; -    } +    if ((int16_t)idx > highest_td) +      highest_td = idx; +    action = &tap_dance_actions[idx]; -    qk_tap_dance_state.active = true; -    qk_tap_dance_state.pressed = record->event.pressed; +    action->state.keycode = keycode; +    action->state.pressed = record->event.pressed;      if (record->event.pressed) { -      qk_tap_dance_state.keycode = keycode; -      qk_tap_dance_state.timer = timer_read (); -      qk_tap_dance_state.count++; +      action->state.count++; +      action->state.timer = timer_read(); + +      if (last_td && last_td != keycode) { +        qk_tap_dance_action_t *paction = &tap_dance_actions[last_td - QK_TAP_DANCE]; +        paction->state.interrupted = true; +        process_tap_dance_action_on_dance_finished (paction); +        reset_tap_dance (&paction->state); +      }      } +    last_td = keycode; +      break;    default: -    if (qk_tap_dance_state.keycode) { -      // if we are here, the tap dance was interrupted by a different key -      idx = qk_tap_dance_state.keycode - QK_TAP_DANCE; -      action = tap_dance_actions[idx]; +    if (!record->event.pressed) +      return true; + +    if (highest_td == -1) +      return true; -      process_tap_dance_action_on_each_tap (action); +    for (int i = 0; i <= highest_td; i++) { +      action = &tap_dance_actions[i]; +      if (action->state.count == 0) +        continue; +      action->state.interrupted = true;        process_tap_dance_action_on_dance_finished (action); -      reset_tap_dance (&qk_tap_dance_state); -      qk_tap_dance_state.active = false; +      reset_tap_dance (&action->state);      }      break;    } -  return r; +  return true;  }  void matrix_scan_tap_dance () { -  if (qk_tap_dance_state.active && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) { -    // if we are here, the tap dance was timed out -    uint16_t idx = qk_tap_dance_state.keycode - QK_TAP_DANCE; -    qk_tap_dance_action_t action = tap_dance_actions[idx]; +  if (highest_td == -1) +    return; + +  for (int i = 0; i <= highest_td; i++) { +    qk_tap_dance_action_t *action = &tap_dance_actions[i]; -    process_tap_dance_action_on_dance_finished (action); -    reset_tap_dance (&qk_tap_dance_state); +    if (action->state.count && timer_elapsed (action->state.timer) > TAPPING_TERM) { +      process_tap_dance_action_on_dance_finished (action); +      reset_tap_dance (&action->state); +    }    }  }  void reset_tap_dance (qk_tap_dance_state_t *state) { -  uint16_t idx = state->keycode - QK_TAP_DANCE; -  qk_tap_dance_action_t action; +  qk_tap_dance_action_t *action;    if (state->pressed)      return; -  action = tap_dance_actions[idx]; +  action = &tap_dance_actions[state->keycode - QK_TAP_DANCE]; +    process_tap_dance_action_on_reset (action); -  state->keycode = 0;    state->count = 0; -  state->active = false; +  state->interrupted = false; +  state->finished = false; +  last_td = 0;  } 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 */ @@ -431,7 +431,7 @@ enum {  };  //Tap Dance Definitions -const qk_tap_dance_action_t tap_dance_actions[] = { +qk_tap_dance_action_t tap_dance_actions[] = {    //Tap once for Esc, twice for Caps Lock    [TD_ESC_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS)  // Other declarations would go here, separated by commas, if you have them @@ -517,7 +517,7 @@ void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {    ergodox_right_led_3_off();  } -const qk_tap_dance_action_t tap_dance_actions[] = { +qk_tap_dance_action_t tap_dance_actions[] = {    [CT_SE]  = ACTION_TAP_DANCE_DOUBLE (KC_SPC, KC_ENT)   ,[CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cln_finished, dance_cln_reset)   ,[CT_EGG] = ACTION_TAP_DANCE_FN (dance_egg) | 
