From 888026ae73e691e90ea34819e3f625d07aef2629 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Mon, 15 May 2017 00:10:25 -0400 Subject: nikchi flake --- keyboards/frosty_flake/keymaps/nikchi/Makefile | 23 +++++++ keyboards/frosty_flake/keymaps/nikchi/config.h | 23 +++++++ keyboards/frosty_flake/keymaps/nikchi/keymap.c | 85 +++++++++++++++++++++++++ keyboards/frosty_flake/keymaps/nikchi/readme.md | 24 +++++++ 4 files changed, 155 insertions(+) create mode 100644 keyboards/frosty_flake/keymaps/nikchi/Makefile create mode 100644 keyboards/frosty_flake/keymaps/nikchi/config.h create mode 100644 keyboards/frosty_flake/keymaps/nikchi/keymap.c create mode 100644 keyboards/frosty_flake/keymaps/nikchi/readme.md (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/Makefile b/keyboards/frosty_flake/keymaps/nikchi/Makefile new file mode 100644 index 0000000000..377a25c281 --- /dev/null +++ b/keyboards/frosty_flake/keymaps/nikchi/Makefile @@ -0,0 +1,23 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +UNICODEMAP_ENABLE = no # unicodemap +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +TAP_DANCE_ENABLE = yes + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/frosty_flake/keymaps/nikchi/config.h new file mode 100644 index 0000000000..45825781df --- /dev/null +++ b/keyboards/frosty_flake/keymaps/nikchi/config.h @@ -0,0 +1,23 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#define TAPPING_TERM 200 +#define LEADER_TIMEOUT 400 + +#define DISABLE_SPACE_CADET_ROLLOVER + +#define UNICODE_TYPE_DELAY 0 + +#define LSPO_KEY KC_9 +#define RSPC_KEY KC_0 + +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_TIME_TO_MAX 60 +#define MOUSEKEY_MAX_SPEED 7 +#define MOUSEKEY_WHEEL_DELAY 0 +// place overrides here + +#endif diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c new file mode 100644 index 0000000000..955891eb21 --- /dev/null +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -0,0 +1,85 @@ +#include "frosty_flake.h" +#define _______ KC_TRNS + +//Tap Dance Declarations +enum { + TD_CTCPS = 0 +}; + +//Tap Dance Definitions +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) +// Other declarations would go here, separated by commas, if you have them +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. +{ + switch(id) { + case 0: // this would trigger when you hit a key mapped as M(0) + if (record->event.pressed) { + return MACRO( I(1), D(LGUI), D(LCTL), D(D), U(LGUI), U(LCTL), U(D), END ); // NEW DESKTOP + } + break; + case 1: // this would trigger when you hit a key mapped as M(0) + if (record->event.pressed) { + return MACRO( I(1), D(LGUI), D(LCTL), D(LEFT), U(LGUI), U(LCTL), U(LEFT), END ); // LEFT DESKTOP + } + break; + case 2: // this would trigger when you hit a key mapped as M(0) + if (record->event.pressed) { + return MACRO( I(1), D(LGUI), D(LCTL), D(RGHT), U(LGUI), U(LCTL), U(RGHT), END ); // RIGHT DESKTOP + } + break; + case 3: // this would trigger when you hit a key mapped as M(0) + if (record->event.pressed) { + return MACRO( I(1), D(LGUI), D(LCTL), D(F4), U(LGUI), U(LCTL), U(F4), END ); // CLOSE DESKTOP + } + break; + } + return MACRO_NONE; +}; + +LEADER_EXTERNS(); + +void matrix_scan_user(void) { + LEADER_DICTIONARY() { + leading = false; + leader_end(); + + SEQ_TWO_KEYS(KC_A, KC_A) { + register_code(KC_LCTL); + register_code(KC_A); + unregister_code(KC_A); + register_code(KC_C); + unregister_code(KC_C); + unregister_code(KC_LCTL); + } + + } +} + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = 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, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ + KC_LSPO,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSPC, KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ + 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, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, 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, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,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, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ + KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ + KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, TG(2),_______ , KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), +[2] = 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, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, 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, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_MUTE,KC_VOLD,KC_VOLU, KC_P7, KC_P8, KC_P9,KC_PPLS, \ + KC_LCTL, KC_D, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ + KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ + KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, _______,_______ , KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), +}; diff --git a/keyboards/frosty_flake/keymaps/nikchi/readme.md b/keyboards/frosty_flake/keymaps/nikchi/readme.md new file mode 100644 index 0000000000..b6a89e8dde --- /dev/null +++ b/keyboards/frosty_flake/keymaps/nikchi/readme.md @@ -0,0 +1,24 @@ +# The Nikchi's keymap for frosty_flake + +### FEATURING +-SPACE CADET +-Caps Lock is now LCTRL +-LCTRL is Tap(LCTRL, Caps Lock) + +### LEADER KEY - RALT +COMBOS +-a,s => Select All, Copy + + + +### FN REBINDS for Windows +``` + [W] [New Desktop] +[A][S][D] [Left Desk][Delete Desk][Right Desk] + +[Ins][Hom][PUp] [RW][PP][FF] +[Del][End][PDn] [MU][VD][VU] + +Arrows are Mouskeys, left three mods are clicks + +``` \ No newline at end of file -- cgit v1.2.3 From b2b72058e5a29dff3f28761c2d0bb5f035c2f710 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Mon, 15 May 2017 00:12:04 -0400 Subject: change readme --- keyboards/frosty_flake/keymaps/nikchi/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/readme.md b/keyboards/frosty_flake/keymaps/nikchi/readme.md index b6a89e8dde..0b01f9dbf8 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/readme.md +++ b/keyboards/frosty_flake/keymaps/nikchi/readme.md @@ -7,7 +7,7 @@ ### LEADER KEY - RALT COMBOS --a,s => Select All, Copy +-a,a => Select All, Copy -- cgit v1.2.3 From eb660ef2184565c6bb69f1f67f7af8918d15688f Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Mon, 15 May 2017 01:52:45 -0400 Subject: emoji support but --- keyboards/frosty_flake/keymaps/nikchi/Makefile | 2 +- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 99 +++++++++++++++++++------- 2 files changed, 74 insertions(+), 27 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/Makefile b/keyboards/frosty_flake/keymaps/nikchi/Makefile index 377a25c281..ad86e82d20 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/Makefile +++ b/keyboards/frosty_flake/keymaps/nikchi/Makefile @@ -12,7 +12,7 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode -UNICODEMAP_ENABLE = no # unicodemap +UNICODEMAP_ENABLE = yes # unicodemap BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index 955891eb21..58964d1e39 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -1,4 +1,9 @@ #include "frosty_flake.h" +#include "action_layer.h" +#include "eeconfig.h" +#include "process_unicode.h" +#include "quantum.h" + #define _______ KC_TRNS //Tap Dance Declarations @@ -13,25 +18,32 @@ qk_tap_dance_action_t tap_dance_actions[] = { // Other declarations would go here, separated by commas, if you have them }; +enum my_macros { + NEWDESK = 0, + LEFTDESK, + RIGHTDESK, + CLOSEDESK +}; + const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. { switch(id) { - case 0: // this would trigger when you hit a key mapped as M(0) + case NEWDESK: // this would trigger when you hit a key mapped as M(0) if (record->event.pressed) { return MACRO( I(1), D(LGUI), D(LCTL), D(D), U(LGUI), U(LCTL), U(D), END ); // NEW DESKTOP } break; - case 1: // this would trigger when you hit a key mapped as M(0) + case LEFTDESK: // this would trigger when you hit a key mapped as M(0) if (record->event.pressed) { return MACRO( I(1), D(LGUI), D(LCTL), D(LEFT), U(LGUI), U(LCTL), U(LEFT), END ); // LEFT DESKTOP } break; - case 2: // this would trigger when you hit a key mapped as M(0) + case RIGHTDESK: // this would trigger when you hit a key mapped as M(0) if (record->event.pressed) { return MACRO( I(1), D(LGUI), D(LCTL), D(RGHT), U(LGUI), U(LCTL), U(RGHT), END ); // RIGHT DESKTOP } break; - case 3: // this would trigger when you hit a key mapped as M(0) + case CLOSEDESK: // this would trigger when you hit a key mapped as M(0) if (record->event.pressed) { return MACRO( I(1), D(LGUI), D(LCTL), D(F4), U(LGUI), U(LCTL), U(F4), END ); // CLOSE DESKTOP } @@ -40,25 +52,36 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // return MACRO_NONE; }; -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_TWO_KEYS(KC_A, KC_A) { - register_code(KC_LCTL); - register_code(KC_A); - unregister_code(KC_A); - register_code(KC_C); - unregister_code(KC_C); - unregister_code(KC_LCTL); - } - } -} +enum unicode_name { + THINK, // thinking face 🤔 + GRIN, // grinning face 😊 + BBB, // dat B 🅱 + POO, // poop 💩 + HUNDR, // 100 💯 + SMRK, // smirk 😏 + WEARY, // good shit 😩 + EGGPL, // EGGPLANT 🍆 + WATER, // wet 💦 + LIT, // fire 🔥 + UNAMU, // unamused 😒 + SNEK // snke 🐍 +}; +const uint32_t PROGMEM unicode_map[] = { + [THINK] = 0x1F914, + [GRIN] = 0x1F600, + [BBB] = 0x1F171, + [POO] = 0x1F4A9, + [HUNDR] = 0x1F4AF, + [SMRK] = 0x1F60F, + [WEARY] = 0x1F629, + [EGGPL] = 0x1F346, + [WATER] = 0x1F4A6, + [LIT] = 0x1F525, + [UNAMU] = 0x1F612, + [SNEK] = 0x1F40D + }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP(\ @@ -70,10 +93,10 @@ 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, \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, 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, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,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, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ - KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ + KC_GRV, X(GRIN),X(THINK),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, \ + 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, \ KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, TG(2),_______ , KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), [2] = 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, \ @@ -81,5 +104,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_MUTE,KC_VOLD,KC_VOLU, KC_P7, KC_P8, KC_P9,KC_PPLS, \ KC_LCTL, KC_D, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_MS_U, KC_P1, KC_P2, KC_P3,KC_PENT, \ - KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, _______,_______ , KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), + KC_BTN1,KC_BTN3,KC_BTN2, KC_SPC, KC_RALT,KC_RGUI, _______, _______, KC_MS_L,KC_MS_D,KC_MS_R, KC_P0,KC_PDOT), +}; + +LEADER_EXTERNS(); + +void matrix_scan_user(void) { + LEADER_DICTIONARY() { + leading = false; + leader_end(); + + SEQ_TWO_KEYS(KC_A, KC_A) { + register_code(KC_LCTL); + register_code(KC_A); + unregister_code(KC_A); + register_code(KC_C); + unregister_code(KC_C); + unregister_code(KC_LCTL); + } + + } +} + +void matrix_init_user(void) { + _delay_ms(500); + set_unicode_input_mode(UC_WINC); }; -- cgit v1.2.3 From 5d965a8d416cef48b17fc0acb6d35370d40ffbff Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Mon, 15 May 2017 02:19:50 -0400 Subject: emojis and reorg --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 73 ++++++++++++++++---------- 1 file changed, 45 insertions(+), 28 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index 58964d1e39..a764e7e9d6 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -6,16 +6,30 @@ #define _______ KC_TRNS +void tap(uint16_t keycode){ + register_code(keycode); + unregister_code(keycode); +}; + + //Tap Dance Declarations -enum { +enum taps{ TD_CTCPS = 0 }; -//Tap Dance Definitions -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) -// Other declarations would go here, separated by commas, if you have them +enum unicode_name { + THINK, // thinking face 🤔 + GRIN, // grinning face 😊 + BBB, // dat B 🅱 + POO, // poop 💩 + HUNDR, // 100 💯 + SMRK, // smirk 😏 + WEARY, // good shit 😩 + EGGPL, // EGGPLANT 🍆 + WATER, // wet 💦 + LIT, // fire 🔥 + UNAMU, // unamused 😒 + SNEK // snke 🐍 }; enum my_macros { @@ -25,8 +39,24 @@ enum my_macros { CLOSEDESK }; -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. -{ +enum quick { + DISFACE = 0, + TFLIP, + TPUT, + SHRUG, + FACE, + RANDIG +}; + +// Tap Dance Definitions +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) +// Other declarations would go here, separated by commas, if you have them +}; + +// macros +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { switch(id) { case NEWDESK: // this would trigger when you hit a key mapped as M(0) if (record->event.pressed) { @@ -52,22 +82,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // return MACRO_NONE; }; - -enum unicode_name { - THINK, // thinking face 🤔 - GRIN, // grinning face 😊 - BBB, // dat B 🅱 - POO, // poop 💩 - HUNDR, // 100 💯 - SMRK, // smirk 😏 - WEARY, // good shit 😩 - EGGPL, // EGGPLANT 🍆 - WATER, // wet 💦 - LIT, // fire 🔥 - UNAMU, // unamused 😒 - SNEK // snke 🐍 -}; - +// emojis in unicode const uint32_t PROGMEM unicode_map[] = { [THINK] = 0x1F914, [GRIN] = 0x1F600, @@ -83,6 +98,8 @@ const uint32_t PROGMEM unicode_map[] = { [SNEK] = 0x1F40D }; + +// Layouts const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = 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, \ @@ -116,10 +133,8 @@ void matrix_scan_user(void) { SEQ_TWO_KEYS(KC_A, KC_A) { register_code(KC_LCTL); - register_code(KC_A); - unregister_code(KC_A); - register_code(KC_C); - unregister_code(KC_C); + tap(KC_A); + tap(KC_C); unregister_code(KC_LCTL); } @@ -130,3 +145,5 @@ void matrix_init_user(void) { _delay_ms(500); set_unicode_input_mode(UC_WINC); }; + + -- cgit v1.2.3 From 3ed2147a888401ef31a008db02a4ef8bd25d4380 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Tue, 23 May 2017 13:13:20 -0400 Subject: preonic map --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index a764e7e9d6..babc7f15bd 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -10,8 +10,7 @@ void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); }; - - +s //Tap Dance Declarations enum taps{ TD_CTCPS = 0 -- cgit v1.2.3 From b3eeb9d84a6af13c4fd35835f4cb2da093a7015e Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Tue, 23 May 2017 18:47:06 -0400 Subject: removed s --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index babc7f15bd..908db3f801 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -10,7 +10,7 @@ void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); }; -s + //Tap Dance Declarations enum taps{ TD_CTCPS = 0 @@ -97,7 +97,6 @@ const uint32_t PROGMEM unicode_map[] = { [SNEK] = 0x1F40D }; - // Layouts const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP(\ -- cgit v1.2.3 From 6536b1ce2a136b7e1d0d4bbd94ff47e10765f644 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Tue, 23 May 2017 23:52:48 -0400 Subject: =?UTF-8?q?Tap=20dancing=20emoji=20support=20=F0=9F=98=A9?= =?UTF-8?q?=F0=9F=98=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 75 ++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 11 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index 908db3f801..5bb553de00 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -2,10 +2,16 @@ #include "action_layer.h" #include "eeconfig.h" #include "process_unicode.h" +#include "process_unicodemap.h" #include "quantum.h" #define _______ KC_TRNS +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 resetEmojis(qk_tap_dance_state_t *state, void *user_data); + void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); @@ -13,22 +19,32 @@ void tap(uint16_t keycode){ //Tap Dance Declarations enum taps{ - TD_CTCPS = 0 + TD_CTCPS = 0, + EMOJIS, + ANIMAL }; enum unicode_name { - THINK, // thinking face 🤔 + THINK = 1, // thinking face 🤔 GRIN, // grinning face 😊 + SMRK, // smirk 😏 + WEARY, // good shit 😩 + UNAMU, // unamused 😒 + + SNEK, // snke 🐍 + PENGUIN, // 🐧 + DRAGON, // 🐉 + MONKEY, // 🐒 + CHICK, // 🐥 + BBB, // dat B 🅱 POO, // poop 💩 HUNDR, // 100 💯 - SMRK, // smirk 😏 - WEARY, // good shit 😩 EGGPL, // EGGPLANT 🍆 WATER, // wet 💦 - LIT, // fire 🔥 - UNAMU, // unamused 😒 - SNEK // snke 🐍 + + LIT // fire 🔥 + }; enum my_macros { @@ -37,7 +53,6 @@ enum my_macros { RIGHTDESK, CLOSEDESK }; - enum quick { DISFACE = 0, TFLIP, @@ -50,7 +65,9 @@ enum quick { // Tap Dance Definitions 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) + [TD_CTCPS] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_CAPS), + [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, resetEmojis), + [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, resetEmojis) // Other declarations would go here, separated by commas, if you have them }; @@ -94,7 +111,11 @@ const uint32_t PROGMEM unicode_map[] = { [WATER] = 0x1F4A6, [LIT] = 0x1F525, [UNAMU] = 0x1F612, - [SNEK] = 0x1F40D + [SNEK] = 0x1F40D, + [PENGUIN] = 0x1F427, + [MONKEY] = 0x1F412, + [CHICK] = 0x1F425, + [DRAGON] = 0x1F409 }; // Layouts @@ -108,7 +129,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, \ - KC_GRV, X(GRIN),X(THINK),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),X(THINK),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, \ 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, \ @@ -145,3 +166,35 @@ void matrix_init_user(void) { }; +void cycleEmojis(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])); + unicode_input_finish(); + } + else if(state->count <= 5) { + tap(KC_BSPC); + unicode_input_start(); + register_hex32(pgm_read_dword(&unicode_map[state->count])); + unicode_input_finish(); + } +}; + +void cycleAnimals(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+5])); + unicode_input_finish(); + } + else if(state->count <= 5) { + tap(KC_BSPC); + unicode_input_start(); + register_hex32(pgm_read_dword(&unicode_map[state->count+5])); + unicode_input_finish(); + } +}; + +void resetEmojis(qk_tap_dance_state_t *state, void *user_data) { + +}; + -- cgit v1.2.3 From ef1714f443be67103ce9eb6adedef6c8875d17e5 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Wed, 24 May 2017 00:35:04 -0400 Subject: more emoji function comments --- keyboards/frosty_flake/keymaps/nikchi/config.h | 3 +- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 48 +++++++++++++++++++------- 2 files changed, 38 insertions(+), 13 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/frosty_flake/keymaps/nikchi/config.h index 45825781df..e91d082c8a 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 200 +#define TAPPING_TERM 300 #define LEADER_TIMEOUT 400 #define DISABLE_SPACE_CADET_ROLLOVER @@ -21,3 +21,4 @@ // place overrides here #endif + diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/frosty_flake/keymaps/nikchi/keymap.c index 5bb553de00..c9e2207214 100644 --- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c +++ b/keyboards/frosty_flake/keymaps/nikchi/keymap.c @@ -7,10 +7,12 @@ #define _______ KC_TRNS + +//declarations for tap dancing emojis 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 resetEmojis(qk_tap_dance_state_t *state, void *user_data); +void cycleHands(qk_tap_dance_state_t *state, void *user_data); void tap(uint16_t keycode){ register_code(keycode); @@ -21,10 +23,11 @@ void tap(uint16_t keycode){ enum taps{ TD_CTCPS = 0, EMOJIS, - ANIMAL + ANIMAL, + HAND }; -enum unicode_name { +enum unicode_name { // split every five emojis THINK = 1, // thinking face 🤔 GRIN, // grinning face 😊 SMRK, // smirk 😏 @@ -37,6 +40,12 @@ enum unicode_name { MONKEY, // 🐒 CHICK, // 🐥 + OKOK, // 👌 + EFFU, // 🖕 + INUP, // 👆 + THUP, // 👍 + THDN, // 👎 + BBB, // dat B 🅱 POO, // poop 💩 HUNDR, // 100 💯 @@ -66,8 +75,9 @@ 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, resetEmojis), - [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, resetEmojis) + [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) // Other declarations would go here, separated by commas, if you have them }; @@ -115,9 +125,13 @@ const uint32_t PROGMEM unicode_map[] = { [PENGUIN] = 0x1F427, [MONKEY] = 0x1F412, [CHICK] = 0x1F425, - [DRAGON] = 0x1F409 + [DRAGON] = 0x1F409, + [OKOK] = 0x1F44C, + [EFFU] = 0x1F595, + [INUP] = 0x1F446, + [THDN] = 0x1F44E, + [THUP] = 0x1F44D }; - // Layouts const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP(\ @@ -129,7 +143,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),X(THINK),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),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, \ 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, \ @@ -150,7 +164,7 @@ void matrix_scan_user(void) { leading = false; leader_end(); - SEQ_TWO_KEYS(KC_A, KC_A) { + SEQ_TWO_KEYS(KC_A, KC_A) { // select all and copy register_code(KC_LCTL); tap(KC_A); tap(KC_C); @@ -180,7 +194,7 @@ void cycleEmojis(qk_tap_dance_state_t *state, void *user_data) { } }; -void cycleAnimals(qk_tap_dance_state_t *state, void *user_data) { +void cycleAnimals(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+5])); @@ -194,7 +208,17 @@ void cycleAnimals(qk_tap_dance_state_t *state, void *user_data) { } }; -void resetEmojis(qk_tap_dance_state_t *state, void *user_data) { - +void cycleHands(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+10])); + unicode_input_finish(); + } + else if(state->count <= 5) { + tap(KC_BSPC); + unicode_input_start(); + register_hex32(pgm_read_dword(&unicode_map[state->count+10])); + unicode_input_finish(); + } }; -- cgit v1.2.3 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/nikchi') 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.3 From e695b5a33b97cfb4f9dd8bc8ecaff8aa7e0f14cc Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Thu, 25 May 2017 00:41:00 -0400 Subject: 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 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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 }; -- cgit v1.2.3 From aeb3a34636c614cd392cfc6268491a51a461df31 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Thu, 25 May 2017 16:26:30 -0400 Subject: moved specific tap term to its own function included custom_tapping_term in action struct --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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 }; -- cgit v1.2.3 From d462409762165dadf2e514f084229c45e2c3b0c6 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Fri, 26 May 2017 00:18:59 -0400 Subject: 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 (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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 -- cgit v1.2.3 From 1bff72c0099d5a59684f912f81ede3f0f0198028 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Fri, 26 May 2017 00:19:12 -0400 Subject: - --- keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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. -- cgit v1.2.3 From 66e9cf9718770206f68e33a7f88b46ed372ff2a4 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Fri, 26 May 2017 15:59:34 -0400 Subject: clarified tap --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 9 +++++---- keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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. -- cgit v1.2.3 From 5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Mon, 29 May 2017 21:25:50 -0400 Subject: switched to uint8 and 16 --- keyboards/frosty_flake/keymaps/nikchi/config.h | 2 +- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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) { } }; + -- cgit v1.2.3 From 3c4022c41bc69b0bec94b2f34b6958ff41924254 Mon Sep 17 00:00:00 2001 From: Nick Choi Date: Tue, 30 May 2017 14:19:57 -0400 Subject: hmm? --- keyboards/frosty_flake/keymaps/nikchi/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/frosty_flake/keymaps/nikchi') 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(); -- cgit v1.2.3