From 17a378715ebfe74f4e7b22520ab7626054f9f677 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Wed, 24 May 2017 23:43:02 -0400 Subject: Tapping Term and Memes TD for FF --- keyboards/frosty_flake/keymaps/nikchi/config.h | 3 +-- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) (limited to 'keyboards/frosty_flake/keymaps') 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(); + } +}; + -- cgit v1.2.1