From bae54f3cad588fc23eb313c1badc8693115dd2da Mon Sep 17 00:00:00 2001 From: bluepython508 Date: Thu, 14 Mar 2024 10:13:38 +0000 Subject: [PATCH] Formatting, remove numbers from SYM layer, use KC_LSFT instead of OS_ --- .../kyria/rev3/keymaps/bluepython508/keymap.c | 32 +++++++++---------- .../kyria/rev3/keymaps/bluepython508/rules.mk | 1 - 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c index 7652ca5..4b47d41 100644 --- a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c +++ b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "action.h" -#include "timer.h" #include QMK_KEYBOARD_H enum keycodes { @@ -25,7 +23,7 @@ enum keycodes { }; enum layers { - _COLEMAK_DH = 0, + _TYPE = 0, _GAME, _SYM, _NUM, @@ -38,7 +36,7 @@ enum layers { #define NUM MO(_NUM) #define NAV MO(_NAV) #define FUN MO(_FUN) -#define TYPING DF(_COLEMAK_DH) +#define TYPE DF(_TYPE) #define GAME DF(_GAME) #define C_SPC C(KC_SPACE) @@ -50,10 +48,10 @@ enum layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_COLEMAK_DH] = LAYOUT( + [_TYPE] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, XXXXXXX, XXXXXXX, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, - XXXXXXX, KC_Z, KC_X, KC_C, KC_D, KC_V, XXXXXXX, NUM, FUN, XXXXXXX, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, OS_LSFT, + XXXXXXX, KC_Z, KC_X, KC_C, KC_D, KC_V, XXXXXXX, NUM, FUN, XXXXXXX, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, XXXXXXX, QK_REP, OS_LSFT, KC_ENT, SYM, NAV, KC_SPC, KC_ESC, QK_AREP, KC_APP ), [_NAV] = LAYOUT( @@ -63,29 +61,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_SYM] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, + KC_GRV, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, KC_EQL, XXXXXXX, KC_TILD, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, KC_LPRN, KC_RPRN, KC_COLN, XXXXXXX, XXXXXXX, XXXXXXX, KC_PLUS, - KC_PIPE, KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, _______, _______, _______, _______, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT, KC_SLSH, KC_QUES, + XXXXXXX, KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, _______, _______, _______, _______, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_FUN] = LAYOUT( - GAME, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUSE, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, - XXXXXXX, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, XXXXXXX, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_VOLD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, + XXXXXXX, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, XXXXXXX, GAME, KC_F5, KC_F6, KC_F7, KC_F8, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [_NUM] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_PLUS, XXXXXXX, + XXXXXXX, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, XXXXXXX, KC_0, KC_4, KC_5, KC_6, KC_DOT, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX, KC_7, KC_8, KC_9, KC_SLSH, XXXXXXX, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), [_GAME] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_UP, KC_O, KC_P, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_K, KC_LEFT, KC_DOWN, KC_RGHT, KC_L, KC_M, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_TAB, TYPING, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_COMM, KC_DOT, KC_SLSH, KC_J, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_TAB, TYPE, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_COMM, KC_DOT, KC_SLSH, KC_J, XXXXXXX, XXXXXXX, OS_LSFT, KC_ENT, XXXXXXX, KC_BSPC, KC_SPC, KC_RSFT, KC_ENT, XXXXXXX ), - [_NUM] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, - XXXXXXX, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, XXXXXXX, KC_0, KC_4, KC_5, KC_6, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, XXXXXXX, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), // [_LAYERINDEX] = LAYOUT( // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk index 2db95a5..d683fc7 100644 --- a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk +++ b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk @@ -1,3 +1,2 @@ CONVERT_TO = liatris -CAPS_WORD_ENABLE = yes REPEAT_KEY_ENABLE = yes