diff options
| author | Toni <jeder@mail1a.de> | 2016-08-19 09:49:56 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-08-19 09:49:56 +0200 |
| commit | 225c73ed30b97229bcb88182b5153c27082886f9 (patch) | |
| tree | 3aa08f903fd3dd886656efccf96020083c8c1f9f /quantum/process_keycode | |
| parent | fe906538861c5ee30a75d6f955e611dd38d93977 (diff) | |
| parent | 2c59f71090f5053fee389012871bff801c2b0a2e (diff) | |
| download | qmk_firmware-225c73ed30b97229bcb88182b5153c27082886f9.tar.gz qmk_firmware-225c73ed30b97229bcb88182b5153c27082886f9.zip | |
Merge remote-tracking branch 'origin/master' into amj60
merge with upstream
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index e152f2350..07de3ecb8 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
| @@ -8,9 +8,9 @@ void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data) { | |||
| 8 | qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; | 8 | qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; |
| 9 | 9 | ||
| 10 | if (state->count == 1) { | 10 | if (state->count == 1) { |
| 11 | register_code (pair->kc1); | 11 | register_code16 (pair->kc1); |
| 12 | } else if (state->count == 2) { | 12 | } else if (state->count == 2) { |
| 13 | register_code (pair->kc2); | 13 | register_code16 (pair->kc2); |
| 14 | } | 14 | } |
| 15 | } | 15 | } |
| 16 | 16 | ||
| @@ -18,9 +18,9 @@ void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data) { | |||
| 18 | qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; | 18 | qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; |
| 19 | 19 | ||
| 20 | if (state->count == 1) { | 20 | if (state->count == 1) { |
| 21 | unregister_code (pair->kc1); | 21 | unregister_code16 (pair->kc1); |
| 22 | } else if (state->count == 2) { | 22 | } else if (state->count == 2) { |
| 23 | unregister_code (pair->kc2); | 23 | unregister_code16 (pair->kc2); |
| 24 | } | 24 | } |
| 25 | } | 25 | } |
| 26 | 26 | ||