From 17a378715ebfe74f4e7b22520ab7626054f9f677 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Wed, 24 May 2017 23:43:02 -0400 Subject: [PATCH 01/10] Tapping Term and Memes TD for FF --- .../frosty_flake/keymaps/nikchi/config.h | 3 +-- .../frosty_flake/keymaps/nikchi/keymap.c | 23 ++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/frosty_flake/keymaps/nikchi/config.h index e91d082c8a..31fcefefae 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/config.h +++ b/keyboards/frosty_flake/keymaps/nikchi/config.h @@ -3,7 +3,7 @@ #include "../../config.h" -#define TAPPING_TERM 300 +#define TAPPING_TERM 800 #define LEADER_TIMEOUT 400 #define DISABLE_SPACE_CADET_ROLLOVER @@ -21,4 +21,3 @@ // place overrides here #endif - diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index c9e2207214..afb5197cad 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -13,6 +13,7 @@ void register_hex32(uint32_t hex); void cycleEmojis(qk_tap_dance_state_t *state, void *user_data); void cycleAnimals(qk_tap_dance_state_t *state, void *user_data); void cycleHands(qk_tap_dance_state_t *state, void *user_data); +void cycleMemes(qk_tap_dance_state_t *state, void *user_data); void tap(uint16_t keycode){ register_code(keycode); @@ -24,7 +25,8 @@ enum taps{ TD_CTCPS = 0, EMOJIS, ANIMAL, - HAND + HAND, + MEMES }; enum unicode_name { // split every five emojis @@ -77,7 +79,8 @@ qk_tap_dance_action_t tap_dance_actions[] = { [TD_CTCPS] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_CAPS), [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, NULL), [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, NULL), - [HAND] = ACTION_TAP_DANCE_FN_ADVANCED(cycleHands, NULL, NULL) + [HAND] = ACTION_TAP_DANCE_FN_ADVANCED(cycleHands, NULL, NULL), + [MEMES] = ACTION_TAP_DANCE_FN_ADVANCED(cycleMemes, NULL, NULL) // Other declarations would go here, separated by commas, if you have them }; @@ -143,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TD(TD_CTCPS),KC_LGUI,KC_LALT, KC_SPC, KC_LEAD,KC_RGUI, KC_APP,MO(1) , KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT), [1] = KEYMAP(\ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ - TD(EMOJIS),TD(ANIMAL),TD(HAND),X(SMRK),X(WEARY),X(UNAMU), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,KC_BSPC, KC_MPRV,KC_MPLY,KC_MNXT, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ + TD(EMOJIS),TD(ANIMAL),TD(HAND),TD(MEMES),X(WEARY),X(UNAMU), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,KC_BSPC, KC_MPRV,KC_MPLY,KC_MNXT, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ KC_TAB, KC_Q, M(0), KC_E, KC_R,X(EGGPL),X(WATER), KC_U, KC_I, KC_O, KC_P, KC_UP ,KC_RBRC,KC_BSLS, KC_MUTE,KC_VOLD,KC_VOLU, KC_P7, KC_P8, KC_P9,KC_PPLS, \ KC_LCTL, M(1), M(3), M(2), KC_F, X(LIT), X(SNEK), KC_J, KC_K, KC_L,KC_LEFT,KC_RGHT, KC_ENT, KC_P4, KC_P5, KC_P6, \ KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, X(HUNDR), X(BBB), X(POO), KC_M,KC_COMM, KC_DOT,KC_DOWN, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ @@ -222,3 +225,17 @@ void cycleHands(qk_tap_dance_state_t *state, void *user_data) { } }; +void cycleMemes(qk_tap_dance_state_t *state, void *user_data) { + if(state->count == 1) { + unicode_input_start(); + register_hex32(pgm_read_dword(&unicode_map[state->count+15])); + unicode_input_finish(); + } + else if(state->count <= 5) { + tap(KC_BSPC); + unicode_input_start(); + register_hex32(pgm_read_dword(&unicode_map[state->count+15])); + unicode_input_finish(); + } +}; + From e695b5a33b97cfb4f9dd8bc8ecaff8aa7e0f14cc Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Thu, 25 May 2017 00:41:00 -0400 Subject: [PATCH 02/10] Added per case tapping term, updated FF-nikchi keymap. --- keyboards/frosty_flake/keymaps/nikchi/config.h | 2 +- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 8 ++++---- quantum/process_keycode/process_tap_dance.c | 10 ++++++++-- quantum/process_keycode/process_tap_dance.h | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/frosty_flake/keymaps/nikchi/config.h index 31fcefefae..45825781df 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/config.h +++ b/keyboards/frosty_flake/keymaps/nikchi/config.h @@ -3,7 +3,7 @@ #include "../../config.h" -#define TAPPING_TERM 800 +#define TAPPING_TERM 200 #define LEADER_TIMEOUT 400 #define DISABLE_SPACE_CADET_ROLLOVER diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index afb5197cad..3cfe0ede40 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -77,10 +77,10 @@ enum quick { qk_tap_dance_action_t tap_dance_actions[] = { // Tap once for CTRL, twice for Caps Lock [TD_CTCPS] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_CAPS), - [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, NULL), - [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, NULL), - [HAND] = ACTION_TAP_DANCE_FN_ADVANCED(cycleHands, NULL, NULL), - [MEMES] = ACTION_TAP_DANCE_FN_ADVANCED(cycleMemes, NULL, NULL) + [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, NULL, 800), + [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, NULL, 800), + [HAND] = ACTION_TAP_DANCE_FN_ADVANCED(cycleHands, NULL, NULL, 800), + [MEMES] = ACTION_TAP_DANCE_FN_ADVANCED(cycleMemes, NULL, NULL, 800) // Other declarations would go here, separated by commas, if you have them }; diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index b807ec3c30..e58b6f2dfe 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -130,11 +130,17 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { void matrix_scan_tap_dance () { if (highest_td == -1) return; + int tap_user_defined; for (int i = 0; i <= highest_td; i++) { qk_tap_dance_action_t *action = &tap_dance_actions[i]; - - if (action->state.count && timer_elapsed (action->state.timer) > TAPPING_TERM) { + if(action->user_data != NULL ) { + tap_user_defined = (int)action->user_data; + } + else{ + tap_user_defined = TAPPING_TERM; + } + if (action->state.count && timer_elapsed (action->state.timer) > tap_user_defined) { process_tap_dance_action_on_dance_finished (action); reset_tap_dance (&action->state); } diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index 330809f83a..95d51f4806 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -63,9 +63,9 @@ typedef struct .user_data = NULL, \ } -#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) { \ +#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \ .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \ - .user_data = NULL, \ + .user_data = (void *)(tap_specific_tapping_term), \ } extern qk_tap_dance_action_t tap_dance_actions[]; From aeb3a34636c614cd392cfc6268491a51a461df31 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Thu, 25 May 2017 16:26:30 -0400 Subject: [PATCH 03/10] moved specific tap term to its own function included custom_tapping_term in action struct --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 8 ++++---- quantum/process_keycode/process_tap_dance.c | 6 ++++-- quantum/process_keycode/process_tap_dance.h | 12 ++++++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index 3cfe0ede40..d522fdf1c1 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -77,10 +77,10 @@ enum quick { qk_tap_dance_action_t tap_dance_actions[] = { // Tap once for CTRL, twice for Caps Lock [TD_CTCPS] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_CAPS), - [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, NULL, 800), - [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, NULL, 800), - [HAND] = ACTION_TAP_DANCE_FN_ADVANCED(cycleHands, NULL, NULL, 800), - [MEMES] = ACTION_TAP_DANCE_FN_ADVANCED(cycleMemes, NULL, NULL, 800) + [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleEmojis, NULL, NULL, 800), + [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleAnimals, NULL, NULL, 800), + [HAND] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleHands, NULL, NULL, 800), + [MEMES] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleMemes, NULL, NULL, 800) // Other declarations would go here, separated by commas, if you have them }; diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index e58b6f2dfe..2c7f6e937e 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -127,6 +127,8 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { return true; } + + void matrix_scan_tap_dance () { if (highest_td == -1) return; @@ -134,8 +136,8 @@ void matrix_scan_tap_dance () { for (int i = 0; i <= highest_td; i++) { qk_tap_dance_action_t *action = &tap_dance_actions[i]; - if(action->user_data != NULL ) { - tap_user_defined = (int)action->user_data; + if(action->custom_tapping_term > 0 ) { + tap_user_defined = action->custom_tapping_term; } else{ tap_user_defined = TAPPING_TERM; diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index 95d51f4806..a020f7991e 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -44,6 +44,7 @@ typedef struct qk_tap_dance_user_fn_t on_reset; } fn; qk_tap_dance_state_t state; + uint16_t custom_tapping_term; void *user_data; } qk_tap_dance_action_t; @@ -63,9 +64,16 @@ typedef struct .user_data = NULL, \ } -#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \ +#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) { \ .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \ - .user_data = (void *)(tap_specific_tapping_term), \ + .user_data = NULL, \ + .custom_tapping_term = -1, \ + } + +#define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \ + .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \ + .user_data = NULL, \ + .custom_tapping_term = tap_specific_tapping_term, \ } extern qk_tap_dance_action_t tap_dance_actions[]; From 7c8b166cce8bf5df058913acc07cd6505f83684a Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Thu, 25 May 2017 16:29:57 -0400 Subject: [PATCH 04/10] =?UTF-8?q?changed=20-1=20to=200=20can't=20have=20ne?= =?UTF-8?q?gative=20unsigned=20ints=20=F0=9F=A4=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quantum/process_keycode/process_tap_dance.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index a020f7991e..ef05ebda24 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -67,7 +67,7 @@ typedef struct #define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) { \ .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \ .user_data = NULL, \ - .custom_tapping_term = -1, \ + .custom_tapping_term = 0, \ } #define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \ From b3144112d3b0abb9bf1060185a001e2fb8d8196c Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Thu, 25 May 2017 16:38:06 -0400 Subject: [PATCH 05/10] removed need to set customtapping term 0. defaults to 0 already --- quantum/process_keycode/process_tap_dance.h | 1 - 1 file changed, 1 deletion(-) diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index ef05ebda24..f42c154a05 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -67,7 +67,6 @@ typedef struct #define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) { \ .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \ .user_data = NULL, \ - .custom_tapping_term = 0, \ } #define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \ From d462409762165dadf2e514f084229c45e2c3b0c6 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Fri, 26 May 2017 00:18:59 -0400 Subject: [PATCH 06/10] tenative readme for variable timing tap --- keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md diff --git a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md new file mode 100644 index 0000000000..e69de29bb2 From 1bff72c0099d5a59684f912f81ede3f0f0198028 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Fri, 26 May 2017 00:19:12 -0400 Subject: [PATCH 07/10] - --- keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md index e69de29bb2..7b9695a83a 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md +++ b/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md @@ -0,0 +1,6 @@ +# Tap Dancing to different beats. +Tap Dance is constrained normally by `TAPPING_TERM` defined in your keyboard's config.h This proves to be challenging to work with when sometimes you just need more time to tap out your dance. + +- `ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term)` : This works the same as `ACTION_TAP_DANCE_FN_ADVANCED` just with the extra `tap_specific_tapping_term` arguement at the end. + +`tap_specific_tapping_term` should be the same type and range of values that one would put into the `TAPPING_TERM` definition in the config.h file. From 66e9cf9718770206f68e33a7f88b46ed372ff2a4 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Fri, 26 May 2017 15:59:34 -0400 Subject: [PATCH 08/10] clarified tap --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 9 +++++---- .../frosty_flake/keymaps/nikchi/variableTapDance.md | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index d522fdf1c1..f9dcf45569 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -6,6 +6,7 @@ #include "quantum.h" #define _______ KC_TRNS +#define EMOJIBLOCK 5 //declarations for tap dancing emojis @@ -189,7 +190,7 @@ void cycleEmojis(qk_tap_dance_state_t *state, void *user_data) { register_hex32(pgm_read_dword(&unicode_map[state->count])); unicode_input_finish(); } - else if(state->count <= 5) { + else if(state->count <= EMOJIBLOCK) { tap(KC_BSPC); unicode_input_start(); register_hex32(pgm_read_dword(&unicode_map[state->count])); @@ -203,7 +204,7 @@ void cycleAnimals(qk_tap_dance_state_t *state, void *user_data) { register_hex32(pgm_read_dword(&unicode_map[state->count+5])); unicode_input_finish(); } - else if(state->count <= 5) { + else if(state->count <= EMOJIBLOCK) { tap(KC_BSPC); unicode_input_start(); register_hex32(pgm_read_dword(&unicode_map[state->count+5])); @@ -217,7 +218,7 @@ void cycleHands(qk_tap_dance_state_t *state, void *user_data) { register_hex32(pgm_read_dword(&unicode_map[state->count+10])); unicode_input_finish(); } - else if(state->count <= 5) { + else if(state->count <= EMOJIBLOCK) { tap(KC_BSPC); unicode_input_start(); register_hex32(pgm_read_dword(&unicode_map[state->count+10])); @@ -231,7 +232,7 @@ void cycleMemes(qk_tap_dance_state_t *state, void *user_data) { register_hex32(pgm_read_dword(&unicode_map[state->count+15])); unicode_input_finish(); } - else if(state->count <= 5) { + else if(state->count <= EMOJIBLOCK) { tap(KC_BSPC); unicode_input_start(); register_hex32(pgm_read_dword(&unicode_map[state->count+15])); diff --git a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md index 7b9695a83a..b2e5041393 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md +++ b/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md @@ -1,6 +1,9 @@ # Tap Dancing to different beats. -Tap Dance is constrained normally by `TAPPING_TERM` defined in your keyboard's config.h This proves to be challenging to work with when sometimes you just need more time to tap out your dance. +Tap Dance is constrained normally by `TAPPING_TERM` defined in your keyboard's config.h This proves to be challenging to work with when sometimes you just need more time to tap out your dance, or even a different "beat". + + + +- `ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term)` : This works the same as `ACTION_TAP_DANCE_FN_ADVANCED` just with the extra `tap_specific_tapping_term` arguement at the end. This way you can set a specific tap dance to have a longer or shorter tap in between your taps, giving you more, or less, time in between each tap. -- `ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term)` : This works the same as `ACTION_TAP_DANCE_FN_ADVANCED` just with the extra `tap_specific_tapping_term` arguement at the end. `tap_specific_tapping_term` should be the same type and range of values that one would put into the `TAPPING_TERM` definition in the config.h file. From 5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Mon, 29 May 2017 21:25:50 -0400 Subject: [PATCH 09/10] switched to uint8 and 16 --- keyboards/frosty_flake/keymaps/nikchi/config.h | 2 +- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 15 +++++++-------- quantum/process_keycode/process_tap_dance.c | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/frosty_flake/keymaps/nikchi/config.h index 45825781df..3f78526437 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/config.h +++ b/keyboards/frosty_flake/keymaps/nikchi/config.h @@ -4,7 +4,7 @@ #include "../../config.h" #define TAPPING_TERM 200 -#define LEADER_TIMEOUT 400 +#define LEADER_TIMEOUT 800 #define DISABLE_SPACE_CADET_ROLLOVER diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index f9dcf45569..021ffac803 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -65,14 +65,7 @@ enum my_macros { RIGHTDESK, CLOSEDESK }; -enum quick { - DISFACE = 0, - TFLIP, - TPUT, - SHRUG, - FACE, - RANDIG -}; + // Tap Dance Definitions qk_tap_dance_action_t tap_dance_actions[] = { @@ -174,6 +167,11 @@ void matrix_scan_user(void) { tap(KC_C); unregister_code(KC_LCTL); } + SEQ_THREE_KEYS(KC_L,KC_I,KC_T) { // 🔥 + unicode_input_start(); + register_hex32(pgm_read_dword(&unicode_map[LIT])); + unicode_input_finish(); + } } } @@ -240,3 +238,4 @@ void cycleMemes(qk_tap_dance_state_t *state, void *user_data) { } }; + diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 2c7f6e937e..4fd45810bb 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -132,9 +132,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { void matrix_scan_tap_dance () { if (highest_td == -1) return; - int tap_user_defined; + uint16_t tap_user_defined; -for (int i = 0; i <= highest_td; i++) { +for (uint8_t i = 0; i <= highest_td; i++) { qk_tap_dance_action_t *action = &tap_dance_actions[i]; if(action->custom_tapping_term > 0 ) { tap_user_defined = action->custom_tapping_term; From 3c4022c41bc69b0bec94b2f34b6958ff41924254 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Tue, 30 May 2017 14:19:57 -0400 Subject: [PATCH 10/10] hmm? --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index 021ffac803..fbabb482a5 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -167,7 +167,7 @@ void matrix_scan_user(void) { tap(KC_C); unregister_code(KC_LCTL); } - SEQ_THREE_KEYS(KC_L,KC_I,KC_T) { // 🔥 + SEQ_THREE_KEYS(KC_L,KC_I,KC_T) { // 🔥🔥 unicode_input_start(); register_hex32(pgm_read_dword(&unicode_map[LIT])); unicode_input_finish();