diff --git a/keyboards/kyria/keymaps/default/keymap.c b/keyboards/kyria/keymaps/default/keymap.c index 899eadf0782..6ff04830fa6 100644 --- a/keyboards/kyria/keymaps/default/keymap.c +++ b/keyboards/kyria/keymaps/default/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(RAISE, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE, \ MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_LSFT, KC_LSFT, KC_LSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ - KC_LGUI, KC_DEL, MT(MOD_LALT, KC_ENT), LT(LOWER, KC_SPC), LT(RAISE, KC_ESC), LT(LOWER, KC_ENT), LT(RAISE, KC_SPC), KC_TAB, KC_BSPC, KC_RALT + KC_LGUI, KC_DEL, MT(MOD_LALT, KC_ENT), LT(_LOWER, KC_SPC), LT(_RAISE, KC_ESC), LT(_LOWER, KC_ENT), LT(_RAISE, KC_SPC), KC_TAB, KC_BSPC, KC_RALT ), /* * Lower Layer: Symbols diff --git a/keyboards/kyria/keymaps/thomasbaart/config.h b/keyboards/kyria/keymaps/thomasbaart/config.h index 8e427be3e81..6450d66e979 100644 --- a/keyboards/kyria/keymaps/thomasbaart/config.h +++ b/keyboards/kyria/keymaps/thomasbaart/config.h @@ -34,4 +34,6 @@ // The Leader key allows to flexibly assign macros to key sequences. #define LEADER_PER_KEY_TIMING -#define LEADER_TIMEOUT 300 \ No newline at end of file +#define LEADER_TIMEOUT 350 + +#define TAPPING_TERM 200 \ No newline at end of file diff --git a/keyboards/kyria/keymaps/thomasbaart/keymap.c b/keyboards/kyria/keymaps/thomasbaart/keymap.c index 7b426493c09..3a4b7396768 100644 --- a/keyboards/kyria/keymaps/thomasbaart/keymap.c +++ b/keyboards/kyria/keymaps/thomasbaart/keymap.c @@ -36,24 +36,44 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * Base Layer: QWERTY * * ,-------------------------------------------. ,-------------------------------------------. - * |RAIS/ESC| Q | W | E | R | T | | Y | U | I | O | P | | \ | + * | ESC | Q | W | E | R | T | | Y | U | I | O | P | | \ | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| - * |Ctrl/BS | A | S | D | F | G | | H | J | K | L | ; : | ' " | + * | LSFT | A | S | D | F | G | | H | J | K | L | ; : | ' " | * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| - * | LShift | Z | X | C | V | B |LShift| | |LShift|Leader| N | M | , < | . > | / ? | - _ | + * | LCTL | Z | X | C | V | B |LShift| | | Del |Leader| N | M | , < | . > | / ? | - _ | * `----------------------+------+------+------+------+ | |------+------+------+------+------+----------------------' - * | GUI | Del | Enter| Space| Esc | | Enter| Space| Tab | Bksp | AltGr| - * | | | Alt | Lower| Raise| | Lower| Raise| Nav | | | + * | GUI | Del | | Space| Enter| | Bspc | Space| | Bksp | AltGr| + * | | | Lower| Shift| Alt | | | Nav | Raise| | | * `----------------------------------' `----------------------------------' */ [_QWERTY] = LAYOUT( - LT(RAISE, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE, \ - MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, XXXXXXX, KC_LSFT, KC_LEAD, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ - KC_LGUI, KC_DEL, MT(MOD_LALT, KC_ENT), LT(LOWER, KC_SPC), LT(RAISE, KC_ESC), LT(LOWER, KC_ENT), LT(RAISE, KC_SPC), LT(NAV, KC_TAB), KC_BSPC, KC_RALT + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE, \ + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, XXXXXXX, KC_DEL, KC_LEAD, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ + KC_LGUI, KC_DEL, LOWER, MT(MOD_LSFT, KC_SPC), MT(MOD_LALT, KC_ENT), KC_BSPC, LT(_NAV, KC_SPC), RAISE, KC_TAB, KC_RALT ), /* - * Lower Layer: Symbols + * Lower Layer: Numpad, Media + * + * ,-------------------------------------------. ,-------------------------------------------. + * | | | | VolUp| | | | / ? | 7 & | 8 * | 9 ( | - _ | | + * |--------+------+------+------+------+------| |------+------+------+------+------+--------| + * | | | Prev | Play | Next | CCCV | | * | 4 $ | 5 % | 6 ^ | , < | + | + * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| + * | | | | VolDn| Mute | | | | | | | 0 ) | 1 ! | 2 @ | 3 # | = + | | + * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' + * | | | | | | | | | | | | + * | | | Lower| | | | | Nav | Raise| | | + * `----------------------------------' `----------------------------------' + */ + [_LOWER] = LAYOUT( + _______, _______, _______, KC_VOLU, _______, _______, KC_SLSH, KC_7, KC_8, KC_9, KC_MINS, _______, \ + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_CCCV, KC_ASTR, KC_4, KC_5, KC_6, KC_COMM, KC_PLUS, \ + _______, _______, _______, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_EQL, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +/* + * Raise Layer: Symbols * * ,-------------------------------------------. ,-------------------------------------------. * | | ! | @ | { | } | | | | | | € | | | \ | @@ -62,54 +82,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| * | | % | ^ | [ | ] | ~ | | | | | | & | = | , | . | / ? | - _ | * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' - * | | | | ; | = | | = | ; | | | | - * | | | | | | | | | | | | - * `----------------------------------' `----------------------------------' - */ - [_LOWER] = LAYOUT( - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, EURO, _______, _______, KC_BSLS, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ - _______, _______, _______, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, _______, _______, _______ - ), -/* - * Raise Layer: Numpad, Media - * - * ,-------------------------------------------. ,-------------------------------------------. - * | | | | VolUp| | | | / ? | 7 & | 8 * | 9 ( | - _ | | - * |--------+------+------+------+------+------| |------+------+------+------+------+--------| - * | | | Prev | Play | Next | CCCV | | 0 ) | 4 $ | 5 % | 6 ^ | + | | - * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| - * | | | | VolDn| Mute | | | | | | | * | 1 ! | 2 @ | 3 # | = + | | - * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' - * | | | | | | | | | , < | | | * | | | | | | | | | | | | + * | | | Lower| | | | | Nav | Raise| | | * `----------------------------------' `----------------------------------' */ [_RAISE] = LAYOUT( - _______, _______, _______, KC_VOLU, _______, _______, KC_SLSH, KC_7, KC_8, KC_9, KC_MINS, _______, \ - _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_CCCV, KC_0, KC_4, KC_5, KC_6, KC_PLUS, _______, \ - _______, _______, _______, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_ASTR, KC_1, KC_2, KC_3, KC_EQL, _______, \ - _______, _______, _______, _______, _______, _______, _______, KC_COMM, _______, _______ + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_SCLN, EURO, _______, _______, KC_BSLS, \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* * Navigation Layer * * ,-------------------------------------------. ,-------------------------------------------. - * | | MSpd2| MBTN1| MUp | MBTN2| MWhUp| | PgUp | Home | Up | End | | ScrlLk | + * | | | | | | | | PgUp | Home | Up | End | | ScrlLk | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| - * | | MSpd1| MLeft| MDown|MRight| MWhDn| | PgDn | Left | Down | Right| | CapsLk | + * | | | | | | | | PgDn | Left | Down | Right| | CapsLk | * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| - * | | MSpd0| MBTN4| MBTN3| MBTN5| | | | | | | | | | | | | + * | | | | | | | | | | | | | | | | | | * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' * | | | | | | | | | | | | - * | | | | | | | | | | | | + * | | | Lower| | | | | Nav | Raise| | | * `----------------------------------' `----------------------------------' */ [_NAV] = LAYOUT( - _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, KC_SLCK, \ - _______, KC_ACL1, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_CAPS, \ - _______, KC_ACL0, KC_BTN4, KC_BTN3, KC_BTN5, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, KC_SLCK, \ + _______, _______, _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_CAPS, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* @@ -147,9 +147,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // * `----------------------------------' `----------------------------------' // */ // [_LAYERINDEX] = LAYOUT( -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ // ), }; @@ -179,7 +179,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case EURO: // Sends the Euro sign €. if (record->event.pressed) { - SEND_STRING(SS_RALT(X_5)); + register_code(KC_RALT); + register_code(KC_5); + unregister_code(KC_5); + unregister_code(KC_RALT); } return false; break; @@ -213,7 +216,7 @@ void matrix_scan_user(void) { SEND_STRING("`` " SS_TAP(X_LEFT) SS_TAP(X_LEFT)); } SEQ_ONE_KEY(KC_P) { // Invoke Password Manager - SEND_STRING(SS_LCTL("\\")); + SEND_STRING(SS_LCTRL("\\")); } SEQ_ONE_KEY(KC_S) { // Windows screenshot SEND_STRING(SS_LGUI(SS_TAP(X_ENTER)"S")); diff --git a/keyboards/kyria/keymaps/thomasbaart/rules.mk b/keyboards/kyria/keymaps/thomasbaart/rules.mk index 213c50a80fe..9b8e2941987 100644 --- a/keyboards/kyria/keymaps/thomasbaart/rules.mk +++ b/keyboards/kyria/keymaps/thomasbaart/rules.mk @@ -1,3 +1,5 @@ OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow \ No newline at end of file +ENCODER_ENABLE = yes # Enables the use of one or more encoders +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +LEADER_ENABLE = yes # Enable the Leader Key feature +MOUSEKEY_ENABLE = no