From e33e6798b7ce9bb507b1adb0bac234c4ff05cd60 Mon Sep 17 00:00:00 2001 From: xesc Date: Thu, 19 Sep 2024 20:32:50 +0200 Subject: [PATCH] update corne keymap --- colemak_dh_modified/corne/config.h | 14 ++------- colemak_dh_modified/corne/keymap.c | 46 ++++++++++++++++++------------ colemak_dh_modified/corne/rules.mk | 2 +- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/colemak_dh_modified/corne/config.h b/colemak_dh_modified/corne/config.h index 2c5dfb0..a469c6c 100644 --- a/colemak_dh_modified/corne/config.h +++ b/colemak_dh_modified/corne/config.h @@ -13,20 +13,12 @@ along with this program. If not, see . */ #pragma once -#define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */ -#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */ -#define TAPPING_TOGGLE 1 -#define TAPPING_TERM 190 #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_SNAKE #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_KNIGHT #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_EFFECT_CHRISTMAS - -#define AUTO_SHIFT_TIMEOUT 150 -#define NO_AUTO_SHIFT_ALPHA -#define NO_AUTO_SHIFT_NUMERIC +#define TAPPING_TERM 210 +#define AUTO_SHIFT_TIMEOUT TAPPING_TERM +#define RETRO_SHIFT diff --git a/colemak_dh_modified/corne/keymap.c b/colemak_dh_modified/corne/keymap.c index 48fa436..38855fd 100644 --- a/colemak_dh_modified/corne/keymap.c +++ b/colemak_dh_modified/corne/keymap.c @@ -4,6 +4,12 @@ enum custom_keycodes { CTL_SPC = SAFE_RANGE, }; +bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { + if(IS_RETRO(keycode)) + return true; + return false; +} + bool process_record_user(uint16_t keycode, keyrecord_t *record) { static uint16_t pressed_timer; switch (keycode) { @@ -24,49 +30,53 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -const uint16_t PROGMEM combo1[] = {CTL_SPC, KC_T, COMBO_END}; +const uint16_t PROGMEM combo1[] = {KC_SPC, KC_S, COMBO_END}; const uint16_t PROGMEM combo2[] = {CTL_SPC, KC_S, COMBO_END}; -const uint16_t PROGMEM combo3[] = {CTL_SPC, KC_R, COMBO_END}; -combo_t key_combos[] = { - COMBO(combo1, OSL(2)), - COMBO(combo2, OSL(4)), - COMBO(combo3, OSL(3)), +const uint16_t PROGMEM combo3[] = {KC_SPC, KC_T, COMBO_END}; +const uint16_t PROGMEM combo4[] = {CTL_SPC, KC_T, COMBO_END}; +const uint16_t PROGMEM combo5[] = {KC_SPC, KC_R, COMBO_END}; +combo_t key_combos[] = { + COMBO(combo1, OSL(4)), + COMBO(combo2, OSL(2)), + COMBO(combo3, OSL(2)), + COMBO(combo4, OSL(4)), + COMBO(combo5, OSL(3)), }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_split_3x6_3( - LT(4,KC_TAB), KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, LALT_T(KC_BSPC), - LCTL_T(KC_ESC), KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, RCTL_T(KC_QUOT), + LALT_T(KC_TAB), MT(MOD_LALT,KC_Q), KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, MT(MOD_RALT,KC_SCLN), KC_BSPC, + LCTL_T(KC_ESC), MT(MOD_LSFT,KC_A), LT(4,KC_R), LT(2,KC_S), LT(1,KC_T), LT(3,KC_G), LT(3,KC_M), LT(1,KC_N), LT(2,KC_E), LT(4,KC_I), MT(MOD_RSFT,KC_O), RCTL_T(KC_QUOT), SC_LSPO, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, - OSL(1), KC_SPC, CTL_SPC, RALT_T(KC_TAB), LT(3,KC_ENT), OSL(1) + KC_BSPC, KC_SPC, CTL_SPC, RALT_T(KC_TAB), KC_ENT, KC_BSPC ), [1] = LAYOUT_split_3x6_3( - LT(4,KC_TAB), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, LALT_T(KC_BSPC), + LALT_T(KC_TAB), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, LCTL_T(KC_ESC), KC_NO, KC_AMPR, KC_ASTR, KC_CIRC, KC_NO, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, - TO(1), TO(0), CTL_SPC, RALT_T(KC_TAB), LT(3,KC_ENT), TO(2) + TO(1), TO(0), CTL_SPC, RALT_T(KC_TAB), LT(3,KC_ENT), TO(1) ), [2] = LAYOUT_split_3x6_3( - LT(4,KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_CIRC, KC_7, KC_8, KC_9, KC_0, LALT_T(KC_BSPC), + LALT_T(KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_CIRC, KC_7, KC_8, KC_9, KC_0, KC_BSPC, LCTL_T(KC_ESC), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_COMM, KC_4, KC_5, KC_6, KC_MINS, KC_EQL, SC_LSPO, KC_NO, KC_NO, KC_DEL, KC_F11, KC_F12, KC_DOT, KC_1, KC_2, KC_3, KC_SLSH, KC_ASTR, - TO(4), TO(0), CTL_SPC, RALT_T(KC_TAB), LT(3,KC_ENT), TO(3) + TO(2), TO(0), CTL_SPC, KC_RSFT, LT(3,KC_ENT), TO(2) ), [3] = LAYOUT_split_3x6_3( KC_MUTE, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_MS_D, KC_MS_R, KC_WH_R, KC_NO, KC_NO, KC_ACL0, - LCTL_T(KC_ESC), KC_NO, KC_NO, KC_BTN3, KC_BTN1, KC_BTN2, KC_NO, KC_WH_U, KC_WH_D, KC_NO, KC_NO, KC_ACL1, + LCTL_T(KC_ESC), KC_NO, KC_NO, KC_BTN3, KC_BTN1, KC_BTN2, KC_NO, KC_WH_U, KC_WH_D, KC_NO, OSL(4), KC_ACL1, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_U, KC_MS_L, KC_WH_L, KC_NO, KC_NO, KC_ACL2, - TO(4), TO(0), KC_LGUI, KC_NO, KC_NO, TO(4) + TO(3), TO(0), CTL_SPC, KC_NO, KC_NO, TO(3) ), [4] = LAYOUT_split_3x6_3( - RGB_TOG, RGB_M_B, RGB_M_P, RGB_VAD, RGB_VAI, RGB_M_K, KC_DOWN, KC_RGHT, KC_PGUP, KC_HOME, KC_NO, TO(0), - KC_PSCR, RGB_M_R, RGB_M_SW, RGB_HUD, RGB_HUI, RGB_M_TW, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + RGB_TOG, RGB_M_B, RGB_M_P, RGB_VAD, RGB_VAI, RGB_M_K, KC_DOWN, KC_RGHT, KC_PGUP, KC_HOME, AS_TOGG, TO(0), + LCTL_T(KC_ESC), RGB_M_R, RGB_M_SW, RGB_HUD, RGB_HUI, RGB_M_TW, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, RCTL_T(KC_QUOT), KC_LSFT, RGB_M_G, RGB_M_SN, RGB_SAD, RGB_SAI, RGB_M_X, KC_UP, KC_LEFT, KC_PGDN, KC_END, KC_NO, KC_NO, - KC_NO, TO(0), KC_LGUI, KC_LGUI, KC_ENT, TO(3) + KC_NO, TO(0), CTL_SPC, KC_LGUI, KC_ENT, TO(4) ), }; diff --git a/colemak_dh_modified/corne/rules.mk b/colemak_dh_modified/corne/rules.mk index 463e784..57a03e2 100644 --- a/colemak_dh_modified/corne/rules.mk +++ b/colemak_dh_modified/corne/rules.mk @@ -20,5 +20,5 @@ OLED_ENABLE = no COMBO_ENABLE = yes LTO_ENABLE = yes UNICODE_ENABLE = yes -DYNAMIC_TAPPING_TERM_ENABLE = yes +NKRO_ENABLE = yes AUTO_SHIFT_ENABLE = yes