diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap_extras/keymap_dvorak.h | 15 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_fr_ch.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_french.h | 4 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_german.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_german_ch.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_nordic.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_spanish.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_uk.h | 4 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 52 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 19 | 
10 files changed, 78 insertions, 26 deletions
| diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h index e855056e83..17f2059774 100644 --- a/quantum/keymap_extras/keymap_dvorak.h +++ b/quantum/keymap_extras/keymap_dvorak.h @@ -18,18 +18,19 @@  #define DV_LBRC	KC_MINS  #define DV_RBRC	KC_EQL -#define DV_QUOT KC_Q +#define DV_QUOT	KC_Q  #define DV_COMM	KC_W  #define DV_DOT	KC_E  #define DV_P	KC_R  #define DV_Y	KC_T  #define	DV_F	KC_Y  #define DV_G	KC_U -#define DV_C 	KC_I +#define DV_C	KC_I  #define	DV_R	KC_O  #define DV_L	KC_P  #define DV_SLSH	KC_LBRC  #define DV_EQL	KC_RBRC +#define DV_BSLS	KC_BSLS  #define DV_A	KC_A  #define DV_O	KC_S @@ -68,7 +69,13 @@  #define DV_RPRN	LSFT(DV_0)  #define DV_LCBR	LSFT(DV_LBRC)  #define DV_RCBR	LSFT(DV_RBRC) -#define DV_UNDS LSFT(DV_MINS) -#define DV_PLUS LSFT(DV_EQL) + +#define DV_QUES	LSFT(DV_SLSH) +#define DV_PLUS	LSFT(DV_EQL) +#define DV_PIPE	LSFT(DV_BSLS) + +#define DV_UNDS	LSFT(DV_MINS) + +#define DV_COLN	LSFT(DV_SCLN)  #endif diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h index 3fd9713575..87d4bb24cf 100644 --- a/quantum/keymap_extras/keymap_fr_ch.h +++ b/quantum/keymap_extras/keymap_fr_ch.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define FR_CH_ALGR KC_RALT  // normal characters diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h index 2a44c80b14..834c69650e 100644 --- a/quantum/keymap_extras/keymap_french.h +++ b/quantum/keymap_extras/keymap_french.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define NO_ALGR KC_RALT  // Normal characters @@ -80,4 +80,4 @@  #define FR_EURO	ALGR(KC_E)  #define FR_BULT	ALGR(FR_DLR) -#endif
\ No newline at end of file +#endif diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h index 3f9ae8bade..7e2e0ed44e 100644 --- a/quantum/keymap_extras/keymap_german.h +++ b/quantum/keymap_extras/keymap_german.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define DE_ALGR KC_RALT  // normal characters diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h index 6a782bcd7b..b66d582a44 100644 --- a/quantum/keymap_extras/keymap_german_ch.h +++ b/quantum/keymap_extras/keymap_german_ch.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define CH_ALGR KC_RALT  // normal characters diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h index 3acb8b6983..f8cf4e2e43 100644 --- a/quantum/keymap_extras/keymap_nordic.h +++ b/quantum/keymap_extras/keymap_nordic.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define NO_ALGR KC_RALT  // Normal characters diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h index af76e39fcb..4ba568af23 100644 --- a/quantum/keymap_extras/keymap_spanish.h +++ b/quantum/keymap_extras/keymap_spanish.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define NO_ALGR KC_RALT  // Normal characters diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h index 5c5d951791..00c87afc3e 100644 --- a/quantum/keymap_extras/keymap_uk.h +++ b/quantum/keymap_extras/keymap_uk.h @@ -4,7 +4,7 @@  #include "keymap.h"  // Alt gr -#define ALGR(kc) kc | 0x1400 +#define ALGR(kc) RALT(kc)  #define NO_ALGR KC_RALT  // Normal characters @@ -33,4 +33,4 @@  #define UK_AACT ALGR(KC_A) -#endif
\ No newline at end of file +#endif diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 9b172e1b6c..b9b836df2e 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -22,10 +22,29 @@ static void _process_tap_dance_action_pair (qk_tap_dance_state_t *state,  static void _process_tap_dance_action_fn (qk_tap_dance_state_t *state,                                            qk_tap_dance_user_fn_t fn)  { -  fn(state); +  if (fn) { +    fn(state); +  } +} + +void process_tap_dance_action_on_each_tap (uint16_t keycode) +{ +  uint16_t idx = keycode - QK_TAP_DANCE; +  qk_tap_dance_action_t action; + +  action = tap_dance_actions[idx]; + +  switch (action.type) { +  case QK_TAP_DANCE_TYPE_FN: +    _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_each_tap); +    break; + +  default: +    break; +  }  } -void process_tap_dance_action (uint16_t keycode) +void process_tap_dance_action_on_dance_finished (uint16_t keycode)  {    uint16_t idx = keycode - QK_TAP_DANCE;    qk_tap_dance_action_t action; @@ -38,7 +57,7 @@ void process_tap_dance_action (uint16_t keycode)                                      action.pair.kc1, action.pair.kc2);      break;    case QK_TAP_DANCE_TYPE_FN: -    _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn); +    _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_dance_finished);      break;    default: @@ -51,8 +70,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {    switch(keycode) {    case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: +    process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode);      if (qk_tap_dance_state.keycode && qk_tap_dance_state.keycode != keycode) { -      process_tap_dance_action (qk_tap_dance_state.keycode); +      process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);      } else {        r = false;      } @@ -66,8 +86,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {    default:      if (qk_tap_dance_state.keycode) { -      process_tap_dance_action (qk_tap_dance_state.keycode); - +      // if we are here, the tap dance was interrupted by a different key +      process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode); +      process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);        reset_tap_dance (&qk_tap_dance_state);      }      break; @@ -78,13 +99,28 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {  void matrix_scan_tap_dance () {    if (qk_tap_dance_state.keycode && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) { -    process_tap_dance_action (qk_tap_dance_state.keycode); - +    // if we are here, the tap dance was timed out +    process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);      reset_tap_dance (&qk_tap_dance_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; + +  action = tap_dance_actions[idx]; +  switch (action.type) { +  case QK_TAP_DANCE_TYPE_FN: +    if (action.fn.on_reset) { +      action.fn.on_reset(state); +    } +    break; + +  default: +    break; +  } +    state->keycode = 0;    state->count = 0;  } diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index b9d7c7fcf4..7b820584a8 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -31,18 +31,27 @@ typedef struct        uint16_t kc1;        uint16_t kc2;      } pair; -    qk_tap_dance_user_fn_t fn; +    struct { +      qk_tap_dance_user_fn_t on_each_tap; +      qk_tap_dance_user_fn_t on_dance_finished; +      qk_tap_dance_user_fn_t on_reset; +    } fn;    };  } qk_tap_dance_action_t;  #define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) { \ -    .type = QK_TAP_DANCE_TYPE_PAIR,         \ -    .pair = { kc1, kc2 }                    \ +    .type = QK_TAP_DANCE_TYPE_PAIR, \ +    .pair = { kc1, kc2 }            \    } -#define ACTION_TAP_DANCE_FN(user_fn) { \ +#define ACTION_TAP_DANCE_FN(user_fn) {  \      .type = QK_TAP_DANCE_TYPE_FN, \ -    .fn = user_fn                 \ +    .fn = { NULL, user_fn, NULL } \ +  } + +#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset) { \ +    .type = QK_TAP_DANCE_TYPE_FN,                                              \ +    .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[]; | 
