diff options
author | Casey Webster <casey.webster@gmail.com> | 2021-08-31 19:50:42 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-31 17:50:42 -0700 |
commit | c5ec423438696881c25ce1fe2ee189091e0510d6 (patch) | |
tree | 6d2a0f00c25f82e804a032f0b3a46e65acd74f88 /users | |
parent | fac5ec46564320ebbbc3d1f5575566badca2d3d7 (diff) |
[Keymap] cwebster2 Keymap and userspace updates (#14258)
Diffstat (limited to 'users')
-rw-r--r-- | users/cwebster2/keycodes.c | 17 | ||||
-rw-r--r-- | users/cwebster2/my_miryoku.h | 24 |
2 files changed, 21 insertions, 20 deletions
diff --git a/users/cwebster2/keycodes.c b/users/cwebster2/keycodes.c index 39b4341bd0..f7eb6ad8df 100644 --- a/users/cwebster2/keycodes.c +++ b/users/cwebster2/keycodes.c @@ -27,7 +27,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { register_code(KC_LCTL); } else { unregister_code(KC_LCTL); - if (timer_elapsed(my_colon_timer) < TAPPING_TERM) { + if (timer_elapsed(my_colon_timer) < TAPPING_TERM - 50) { SEND_STRING(":"); } } @@ -38,14 +38,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + case LSFT_T(KC_T): + case LSFT_T(KC_N): + return TAPPING_TERM - 50; case LGUI_T(KC_A): - case LALT_T(KC_S): - case LCTL_T(KC_D): - case LSFT_T(KC_F): - case RSFT_T(KC_J): - case RCTL_T(KC_K): - case RALT_T(KC_L): - case RGUI_T(KC_SCLN): + case LALT_T(KC_R): + case LCTL_T(KC_S): + case LCTL_T(KC_E): + case LALT_T(KC_I): + case LGUI_T(KC_O): return TAPPING_TERM + 150; default: return TAPPING_TERM; diff --git a/users/cwebster2/my_miryoku.h b/users/cwebster2/my_miryoku.h index 943855ad43..2c8ab6fe2b 100644 --- a/users/cwebster2/my_miryoku.h +++ b/users/cwebster2/my_miryoku.h @@ -15,18 +15,18 @@ */ #pragma once -#define _______QWERTY_L1______ KC_Q, KC_W, KC_E, KC_R, KC_T -#define _______QWERTY_L2______ LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G -#define _______QWERTY_L3______ KC_Z, KC_X, KC_C, KC_V, KC_B +#define _______QWERTY_L1______ KC_T, KC_Q, KC_W, KC_E, KC_R +#define _______QWERTY_L2______ KC_G, KC_A, KC_S, KC_D, KC_F +#define _______QWERTY_L3______ KC_B, KC_Z, KC_X, KC_C, KC_V #define _______QWERTY_R1______ KC_Y, KC_U, KC_I, KC_O, KC_P -#define _______QWERTY_R2______ KC_H, RSFT_T(KC_J), RCTL_T(KC_K), RALT_T(KC_L), RGUI_T(KC_SCLN) +#define _______QWERTY_R2______ KC_H, KC_J, KC_K, KC_L, KC_SCLN #define _______QWERTY_R3______ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH #define _______COLEMAK_L1_____ KC_Q, KC_W, KC_F, KC_P, KC_B #define _______COLEMAK_L2_____ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G #define _______COLEMAK_L3_____ KC_Z, KC_X, KC_C, KC_D, KC_V #define _______COLEMAK_R1_____ KC_J, KC_L, KC_U, KC_Y, KC_QUOT -#define _______COLEMAK_R2_____ KC_M, RSFT_T(KC_N), RCTL_T(KC_E), RALT_T(KC_I), RGUI_T(KC_O) +#define _______COLEMAK_R2_____ KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O) #define _______COLEMAK_R3_____ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH #define _______THUMBS_L_______ LT(_MOUSE,KC_ESC), LT(_NAV,KC_SPC), LT(_MEDIA, KC_TAB) @@ -53,16 +53,16 @@ #define _______NUM______L1____ KC_RBRC, KC_7, KC_8, KC_9, KC_LBRC #define _______NUM______L2____ KC_SCLN, KC_4, KC_5, KC_6, KC_EQL -#define _______NUM______L3____ KC_GRV, KC_1, KC_2, KC_3, KC_SLSH +#define _______NUM______L3____ KC_GRV, KC_1, KC_2, KC_3, KC_BSLS #define _______NUM_______T____ KC_DOT, KC_0, KC_MINS -#define _______FN_______L1____ KC_F12, KC_F7, KC_F8, KC_F9, KC_SYSREQ -#define _______FN_______L2____ KC_F11, KC_F4, KC_F5, KC_F6, KC_TRNS -#define _______FN_______L3____ KC_F10, KC_F1, KC_F2, KC_F3, KC_BSLS -#define _______FN________T____ KC_MENU, KC_SLSH, KC_TRNS +#define _______FN_______L1____ KC_F12, KC_F7, KC_F8, KC_F9, KC_SYSREQ +#define _______FN_______L2____ KC_F11, KC_F4, KC_F5, KC_F6, KC_TRNS +#define _______FN_______L3____ KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUSE +#define _______FN________T____ KC_MENU, KC_SPC, KC_TAB -#define _______NAV______R1____ KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_AGIN -#define _______NAV______R2____ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_CAPS +#define _______NAV______R1____ KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_AGIN +#define _______NAV______R2____ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_CAPS #define _______NAV______R3____ KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS #define _______NAV_______T____ KC_ENT, KC_BSPC, KC_DEL |