diff options
| author | di0ib <[email protected]> | 2016-08-07 20:20:16 -1000 | 
|---|---|---|
| committer | di0ib <[email protected]> | 2016-08-07 20:20:16 -1000 | 
| commit | a36b2a0756761513a9853af78d61e8b666b34aa7 (patch) | |
| tree | a783cea131f5afe22788809a069b1a365a9c3fba /quantum/process_keycode | |
| parent | 8610481c372e9de02fe1ec7b77a9f3598a72a372 (diff) | |
| parent | 213cb2c24306e198e717fc162806201567666f36 (diff) | |
| download | qmk_firmware-a36b2a0756761513a9853af78d61e8b666b34aa7.tar.gz qmk_firmware-a36b2a0756761513a9853af78d61e8b666b34aa7.zip | |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_midi.c | 24 | ||||
| -rw-r--r-- | quantum/process_keycode/process_music.c | 7 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 108 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 47 | 
4 files changed, 120 insertions, 66 deletions
| diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c index d6ab9c6264..8784e64f36 100644 --- a/quantum/process_keycode/process_midi.c +++ b/quantum/process_keycode/process_midi.c @@ -1,8 +1,8 @@  #include "process_midi.h"  bool midi_activated = false; -uint8_t starting_note = 0x0C; -int offset = 7; +uint8_t midi_starting_note = 0x0C; +int midi_offset = 7;  bool process_midi(uint16_t keycode, keyrecord_t *record) {      if (keycode == MI_ON && record->event.pressed) { @@ -20,42 +20,42 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {      if (midi_activated) {        if (record->event.key.col == (MATRIX_COLS - 1) && record->event.key.row == (MATRIX_ROWS - 1)) {            if (record->event.pressed) { -              starting_note++; // Change key +              midi_starting_note++; // Change key                midi_send_cc(&midi_device, 0, 0x7B, 0);            }            return false;        }        if (record->event.key.col == (MATRIX_COLS - 2) && record->event.key.row == (MATRIX_ROWS - 1)) {            if (record->event.pressed) { -              starting_note--; // Change key +              midi_starting_note--; // Change key                midi_send_cc(&midi_device, 0, 0x7B, 0);            }            return false;        }        if (record->event.key.col == (MATRIX_COLS - 3) && record->event.key.row == (MATRIX_ROWS - 1) && record->event.pressed) { -          offset++; // Change scale +          midi_offset++; // Change scale            midi_send_cc(&midi_device, 0, 0x7B, 0);            return false;        }        if (record->event.key.col == (MATRIX_COLS - 4) && record->event.key.row == (MATRIX_ROWS - 1) && record->event.pressed) { -          offset--; // Change scale +          midi_offset--; // Change scale            midi_send_cc(&midi_device, 0, 0x7B, 0);            return false;        }        // basic -      // uint8_t note = (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row); +      // uint8_t note = (midi_starting_note + SCALE[record->event.key.col + midi_offset])+12*(MATRIX_ROWS - record->event.key.row);        // advanced -      // uint8_t note = (starting_note + record->event.key.col + offset)+12*(MATRIX_ROWS - record->event.key.row); +      // uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+12*(MATRIX_ROWS - record->event.key.row);        // guitar -      uint8_t note = (starting_note + record->event.key.col + offset)+5*(MATRIX_ROWS - record->event.key.row); +      uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+5*(MATRIX_ROWS - record->event.key.row);        // violin -      // uint8_t note = (starting_note + record->event.key.col + offset)+7*(MATRIX_ROWS - record->event.key.row); +      // uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+7*(MATRIX_ROWS - record->event.key.row);        if (record->event.pressed) { -        // midi_send_noteon(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127); +        // midi_send_noteon(&midi_device, record->event.key.row, midi_starting_note + SCALE[record->event.key.col], 127);          midi_send_noteon(&midi_device, 0, note, 127);        } else { -        // midi_send_noteoff(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127); +        // midi_send_noteoff(&midi_device, record->event.key.row, midi_starting_note + SCALE[record->event.key.col], 127);          midi_send_noteoff(&midi_device, 0, note, 127);        } diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c index c8f3ddb900..2d52e47a72 100644 --- a/quantum/process_keycode/process_music.c +++ b/quantum/process_keycode/process_music.c @@ -6,6 +6,7 @@ int offset = 7;  // music sequencer  static bool music_sequence_recording = false; +static bool music_sequence_recorded = false;  static bool music_sequence_playing = false;  static float music_sequence[16] = {0};  static uint8_t music_sequence_count = 0; @@ -77,6 +78,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {        if (keycode == KC_LCTL && record->event.pressed) { // Start recording          stop_all_notes();          music_sequence_recording = true; +        music_sequence_recorded = false;          music_sequence_playing = false;          music_sequence_count = 0;          return false; @@ -84,12 +86,15 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {        if (keycode == KC_LALT && record->event.pressed) { // Stop recording/playing          stop_all_notes(); +        if (music_sequence_recording) { // was recording +          music_sequence_recorded = true; +        }          music_sequence_recording = false;          music_sequence_playing = false;          return false;        } -      if (keycode == KC_LGUI && record->event.pressed) { // Start playing +      if (keycode == KC_LGUI && record->event.pressed && music_sequence_recorded) { // Start playing          stop_all_notes();          music_sequence_recording = false;          music_sequence_playing = true; diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 9b172e1b6c..5429e34383 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -1,62 +1,86 @@  #include "quantum.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 void _process_tap_dance_action_pair (qk_tap_dance_state_t *state, -                                            uint16_t kc1, uint16_t kc2) { -  uint16_t kc; - -  if (state->count == 0) -    return; +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; -  kc = (state->count == 1) ? kc1 : kc2; +  if (state->count == 1) { +    register_code (pair->kc1); +  } else if (state->count == 2) { +    register_code (pair->kc2); +  } +} -  register_code (kc); -  unregister_code (kc); +void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data) { +  qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; -  if (state->count >= 2) { -    reset_tap_dance (state); +  if (state->count == 1) { +    unregister_code (pair->kc1); +  } else if (state->count == 2) { +    unregister_code (pair->kc2);    }  } -static void _process_tap_dance_action_fn (qk_tap_dance_state_t *state, +static inline void _process_tap_dance_action_fn (qk_tap_dance_state_t *state, +                                          void *user_data,                                            qk_tap_dance_user_fn_t fn)  { -  fn(state); +  if (fn) { +    fn(state, user_data); +  }  } -void process_tap_dance_action (uint16_t keycode) +static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t action)  { -  uint16_t idx = keycode - QK_TAP_DANCE; -  qk_tap_dance_action_t action; - -  action = tap_dance_actions[idx]; +  td_debug("trigger"); +  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_each_tap); +} -  switch (action.type) { -  case QK_TAP_DANCE_TYPE_PAIR: -    _process_tap_dance_action_pair (&qk_tap_dance_state, -                                    action.pair.kc1, action.pair.kc2); -    break; -  case QK_TAP_DANCE_TYPE_FN: -    _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn); -    break; +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); +} -  default: -    break; -  } +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);  }  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;    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 (qk_tap_dance_state.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;      } +    qk_tap_dance_state.active = true; +    qk_tap_dance_state.pressed = record->event.pressed;      if (record->event.pressed) {        qk_tap_dance_state.keycode = keycode;        qk_tap_dance_state.timer = timer_read (); @@ -66,9 +90,14 @@ 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 +      idx = qk_tap_dance_state.keycode - QK_TAP_DANCE; +      action = tap_dance_actions[idx]; +      process_tap_dance_action_on_each_tap (action); +      process_tap_dance_action_on_dance_finished (action);        reset_tap_dance (&qk_tap_dance_state); +      qk_tap_dance_state.active = false;      }      break;    } @@ -77,14 +106,27 @@ 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 (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]; +    process_tap_dance_action_on_dance_finished (action);      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; + +  if (state->pressed) +    return; + +  action = tap_dance_actions[idx]; +  process_tap_dance_action_on_reset (action); +    state->keycode = 0;    state->count = 0; +  state->active = false;  } diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index b9d7c7fcf4..6a1258067e 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -11,41 +11,45 @@ typedef struct    uint8_t count;    uint16_t keycode;    uint16_t timer; +  bool active:1; +  bool pressed:1;  } qk_tap_dance_state_t;  #define TD(n) (QK_TAP_DANCE + n) -typedef enum -{ -  QK_TAP_DANCE_TYPE_PAIR, -  QK_TAP_DANCE_TYPE_FN, -} qk_tap_dance_type_t; - -typedef void (*qk_tap_dance_user_fn_t) (qk_tap_dance_state_t *state); +typedef void (*qk_tap_dance_user_fn_t) (qk_tap_dance_state_t *state, void *user_data);  typedef struct  { -  qk_tap_dance_type_t type; -  union { -    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; +  void *user_data;  } qk_tap_dance_action_t; +typedef struct +{ +  uint16_t kc1; +  uint16_t kc2; +} qk_tap_dance_pair_t; +  #define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) { \ -    .type = QK_TAP_DANCE_TYPE_PAIR,         \ -    .pair = { kc1, kc2 }                    \ +    .fn = { NULL, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset }, \ +    .user_data = (void *)&((qk_tap_dance_pair_t) { kc1, kc2 })  \ +  } + +#define ACTION_TAP_DANCE_FN(user_fn) {  \ +    .fn = { NULL, user_fn, NULL } \    } -#define ACTION_TAP_DANCE_FN(user_fn) { \ -    .type = QK_TAP_DANCE_TYPE_FN, \ -    .fn = user_fn                 \ +#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset) { \ +    .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;  /* To be used internally */ @@ -53,6 +57,9 @@ 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_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); +  #else  #define TD(n) KC_NO | 
