From 54de99e4405bb25c4782d2fab11ad509205d1d7e Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Wed, 19 Oct 2022 09:58:27 +0200 Subject: more miryoku style --- config.h | 4 ++-- keymap.c | 61 ++++++++++++++++++++++++++++++------------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/config.h b/config.h index 471da7e..dd7c6b1 100644 --- a/config.h +++ b/config.h @@ -23,8 +23,8 @@ // settings for home row modifiers // details see https://precondition.github.io/home-row-mods -// bit faster tapping term -#define TAPPING_TERM 180 +// try the default timing +#define TAPPING_TERM 200 // Prevent normal rollover on alphas from accidentally triggering mods. #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keymap.c b/keymap.c index 7294b35..1af9b96 100644 --- a/keymap.c +++ b/keymap.c @@ -68,11 +68,10 @@ bool achordion_chord(uint16_t tap_hold_keycode, // our layers, used as index in layers and rgb lights enum planck_layers { _QWERTY, + _SYM, _NUM, - _NAV, - _CMD, _FN, - _SYM + _NAV }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -81,34 +80,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, XXXXXXX, XXXXXXX, KC_H, RSFT_T(KC_J), RCTL_T(KC_K), LALT_T(KC_L), RGUI_T(KC_QUOT), KC_Z, RALT_T(KC_X), KC_C, KC_V, KC_B, XXXXXXX, XXXXXXX, KC_N, KC_M, KC_COMM, RALT_T(KC_DOT), KC_SLSH, - XXXXXXX, XXXXXXX, XXXXXXX, LT(_NUM, KC_TAB), LT(_NAV, KC_SPC), XXXXXXX, XXXXXXX, LT(_FN, KC_ENT), LT(_SYM, KC_BSPC), XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, LT(_SYM, KC_TAB), LT(_NUM, KC_SPC), XXXXXXX, XXXXXXX, LT(_FN, KC_ENT), LT(_NAV, KC_BSPC), XXXXXXX, XXXXXXX, XXXXXXX ), -[_NUM] = LAYOUT_planck_grid( - KC_ESC, XXXXXXX, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, - KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, - XXXXXXX, KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_SCLN, - XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_SPC, XXXXXXX, XXXXXXX, KC_ENT, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX +[_SYM] = LAYOUT_planck_grid( + KC_ESC, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, + XXXXXXX, KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, + XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_SPC, XXXXXXX, XXXXXXX, KC_UNDS, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX ), -[_NAV] = LAYOUT_planck_grid( - KC_ESC, XXXXXXX, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, - KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCLN, - XXXXXXX, KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_COLN, - XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_SPC, XXXXXXX, XXXXXXX, KC_ENT, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX +[_NUM] = LAYOUT_planck_grid( + KC_ESC, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, + XXXXXXX, KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, + XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_SPC, XXXXXXX, XXXXXXX, KC_MINS, KC_0, XXXXXXX, XXXXXXX, XXXXXXX ), [_FN] = LAYOUT_planck_grid( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, - KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, - KC_F11, KC_F12, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RALT, XXXXXXX, + KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_F11, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, + KC_F10, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_SPC, XXXXXXX, XXXXXXX, KC_ENT, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX ), -[_SYM] = LAYOUT_planck_grid( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, - KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, - KC_UNDS, KC_PLUS, KC_PIPE, KC_TILD, KC_COLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RALT, XXXXXXX, +[_NAV] = LAYOUT_planck_grid( + KC_PGUP, KC_HOME, KC_UP, KC_END, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, + XXXXXXX, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_SPC, XXXXXXX, XXXXXXX, KC_ENT, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX ) @@ -126,28 +125,28 @@ const rgblight_segment_t PROGMEM qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS( {1, 8, HSV_WHITE} ); -const rgblight_segment_t PROGMEM num_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 8, HSV_YELLOW} +const rgblight_segment_t PROGMEM sym_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 8, HSV_BLUE} ); -const rgblight_segment_t PROGMEM nav_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 8, HSV_WHITE} +const rgblight_segment_t PROGMEM num_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 8, HSV_YELLOW} ); const rgblight_segment_t PROGMEM fn_layer[] = RGBLIGHT_LAYER_SEGMENTS( {1, 8, HSV_RED} ); -const rgblight_segment_t PROGMEM sym_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 8, HSV_BLUE} +const rgblight_segment_t PROGMEM nav_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 8, HSV_WHITE} ); const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( [_QWERTY] = qwerty_layer, + [_SYM] = sym_layer, [_NUM] = num_layer, - [_NAV] = nav_layer, [_FN] = fn_layer, - [_SYM] = sym_layer + [_NAV] = nav_layer ); void keyboard_post_init_user(void) { @@ -157,9 +156,9 @@ void keyboard_post_init_user(void) { layer_state_t layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(_SYM, layer_state_cmp(state, _SYM)); rgblight_set_layer_state(_NUM, layer_state_cmp(state, _NUM)); - rgblight_set_layer_state(_NAV, layer_state_cmp(state, _NAV)); rgblight_set_layer_state(_FN, layer_state_cmp(state, _FN)); - rgblight_set_layer_state(_SYM, layer_state_cmp(state, _SYM)); + rgblight_set_layer_state(_NAV, layer_state_cmp(state, _NAV)); return state; } -- cgit v1.2.3