mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-07-05 11:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a bunch of stuff

Browse source 
- the layout wrapper is case sensitive, had K37 when it should be k37
- fixed whitespace formatting in several files
- removed planck from qmk_nontree.json
This commit is contained in:
Victor 2024-04-11 23:45:44 -05:00
parent 72d86e4c52
commit 4d5f908817
Failed to generate hash of commit
7 changed files with 64 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

22
keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
View file

@ -12,23 +12,23 @@ LAYOUT_rollow_wrapper ( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k32, k33, k34, k35, k36, K37 \
k32, k33, k34, k35, k36, k37 \
)
#define ROLLOW(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_1 ] = ROLLOW(LAYER_QWERTY),
[_DEFAULT_LAYER_2 ] = ROLLOW(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3 ] = ROLLOW(LAYER_GAME),
[_NAVIGATION] = ROLLOW(LAYER_NAVIGATION),
[_NUMBER] = ROLLOW(LAYER_NUMBER),
[_SYMBOL] = ROLLOW(LAYER_SYMBOL),
[_FUNCTION] = ROLLOW(LAYER_FUNCTION),
[_MOUSE] = ROLLOW(LAYER_MOUSE),
[_GAME_NUM] = ROLLOW(LAYER_GAME_NUM),
[_CONFIG] = ROLLOW(LAYER_CONFIG)
[_DEFAULT_LAYER_1] = ROLLOW(LAYER_QWERTY),
[_DEFAULT_LAYER_2] = ROLLOW(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = ROLLOW(LAYER_GAME),
[_NAVIGATION] = ROLLOW(LAYER_NAVIGATION),
[_NUMBER] = ROLLOW(LAYER_NUMBER),
[_SYMBOL] = ROLLOW(LAYER_SYMBOL),
[_FUNCTION] = ROLLOW(LAYER_FUNCTION),
[_MOUSE] = ROLLOW(LAYER_MOUSE),
[_GAME_NUM] = ROLLOW(LAYER_GAME_NUM),
[_CONFIG] = ROLLOW(LAYER_CONFIG)
};

20
keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c
View file

@ -19,15 +19,15 @@ LAYOUT_cnano_wrapper ( \
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_1 ] = CNANO(LAYER_QWERTY),
[_DEFAULT_LAYER_2 ] = CNANO(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3 ] = CNANO(LAYER_GAME),
[_NAVIGATION] = CNANO(LAYER_NAVIGATION),
[_NUMBER] = CNANO(LAYER_NUMBER),
[_SYMBOL] = CNANO(LAYER_SYMBOL),
[_FUNCTION] = CNANO(LAYER_FUNCTION),
[_MOUSE] = CNANO(LAYER_MOUSE),
[_GAME_NUM] = CNANO(LAYER_GAME_NUM),
[_CONFIG] = CNANO(LAYER_CONFIG)
[_DEFAULT_LAYER_1] = CNANO(LAYER_QWERTY),
[_DEFAULT_LAYER_2] = CNANO(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = CNANO(LAYER_GAME),
[_NAVIGATION] = CNANO(LAYER_NAVIGATION),
[_NUMBER] = CNANO(LAYER_NUMBER),
[_SYMBOL] = CNANO(LAYER_SYMBOL),
[_FUNCTION] = CNANO(LAYER_FUNCTION),
[_MOUSE] = CNANO(LAYER_MOUSE),
[_GAME_NUM] = CNANO(LAYER_GAME_NUM),
[_CONFIG] = CNANO(LAYER_CONFIG)
};

42
keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
View file

@ -12,23 +12,23 @@ LAYOUT_swoop_wrapper ( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k32, k33, k34, k35, k36, K37 \
k32, k33, k34, k35, k36, k37 \
)
#define SWOOP(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_1 ] = SWOOP(LAYER_QWERTY),
[_DEFAULT_LAYER_2 ] = SWOOP(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3 ] = SWOOP(LAYER_GAME),
[_NAVIGATION] = SWOOP(LAYER_NAVIGATION),
[_NUMBER] = SWOOP(LAYER_NUMBER),
[_SYMBOL] = SWOOP(LAYER_SYMBOL),
[_FUNCTION] = SWOOP(LAYER_FUNCTION),
[_MOUSE] = SWOOP(LAYER_MOUSE),
[_GAME_NUM] = SWOOP(LAYER_GAME_NUM),
[_CONFIG] = SWOOP(LAYER_CONFIG)
[_DEFAULT_LAYER_1] = SWOOP(LAYER_QWERTY),
[_DEFAULT_LAYER_2] = SWOOP(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = SWOOP(LAYER_GAME),
[_NAVIGATION] = SWOOP(LAYER_NAVIGATION),
[_NUMBER] = SWOOP(LAYER_NUMBER),
[_SYMBOL] = SWOOP(LAYER_SYMBOL),
[_FUNCTION] = SWOOP(LAYER_FUNCTION),
[_MOUSE] = SWOOP(LAYER_MOUSE),
[_GAME_NUM] = SWOOP(LAYER_GAME_NUM),
[_CONFIG] = SWOOP(LAYER_CONFIG)
};
@ -37,15 +37,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* may have to swap the hands in this array since we do right side master*/
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_1 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down
[_DEFAULT_LAYER_2 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down
[_DEFAULT_LAYER_3 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx
[_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, //xx,xx left and right
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx
[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, //xx,xx up and down
[_MOUSE] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,??
[_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx
[_CONFIG] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality?
[_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx
[_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, //xx,xx left and right
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx
[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, //xx,xx up and down
[_MOUSE] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,??
[_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx
[_CONFIG] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality?
};
#endif

20
keyboards/crkbd/keymaps/t4corun/keymap.c
View file

@ -19,15 +19,15 @@ LAYOUT_crkbd_wrapper ( \
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_1 ] = CRKBD(LAYER_QWERTY),
[_DEFAULT_LAYER_2 ] = CRKBD(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3 ] = CRKBD(LAYER_GAME),
[_NAVIGATION] = CRKBD(LAYER_NAVIGATION),
[_NUMBER] = CRKBD(LAYER_NUMBER),
[_SYMBOL] = CRKBD(LAYER_SYMBOL),
[_FUNCTION] = CRKBD(LAYER_FUNCTION),
[_MOUSE] = CRKBD(LAYER_MOUSE),
[_GAME_NUM] = CRKBD(LAYER_GAME_NUM),
[_CONFIG] = CRKBD(LAYER_CONFIG)
[_DEFAULT_LAYER_1] = CRKBD(LAYER_QWERTY),
[_DEFAULT_LAYER_2] = CRKBD(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = CRKBD(LAYER_GAME),
[_NAVIGATION] = CRKBD(LAYER_NAVIGATION),
[_NUMBER] = CRKBD(LAYER_NUMBER),
[_SYMBOL] = CRKBD(LAYER_SYMBOL),
[_FUNCTION] = CRKBD(LAYER_FUNCTION),
[_MOUSE] = CRKBD(LAYER_MOUSE),
[_GAME_NUM] = CRKBD(LAYER_GAME_NUM),
[_CONFIG] = CRKBD(LAYER_CONFIG)
};

20
keyboards/planck/keymaps/t4corun/keymap.c
View file

@ -19,15 +19,15 @@ LAYOUT_planck_wrapper ( \
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_1 ] = PLANCK(LAYER_QWERTY),
[_DEFAULT_LAYER_2 ] = PLANCK(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3 ] = PLANCK(LAYER_GAME),
[_NAVIGATION] = PLANCK(LAYER_NAVIGATION),
[_NUMBER] = PLANCK(LAYER_NUMBER),
[_SYMBOL] = PLANCK(LAYER_SYMBOL),
[_FUNCTION] = PLANCK(LAYER_FUNCTION),
[_MOUSE] = PLANCK(LAYER_MOUSE),
[_GAME_NUM] = PLANCK(LAYER_GAME_NUM),
[_CONFIG] = PLANCK(LAYER_CONFIG)
[_DEFAULT_LAYER_1] = PLANCK(LAYER_QWERTY),
[_DEFAULT_LAYER_2] = PLANCK(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = PLANCK(LAYER_GAME),
[_NAVIGATION] = PLANCK(LAYER_NAVIGATION),
[_NUMBER] = PLANCK(LAYER_NUMBER),
[_SYMBOL] = PLANCK(LAYER_SYMBOL),
[_FUNCTION] = PLANCK(LAYER_FUNCTION),
[_MOUSE] = PLANCK(LAYER_MOUSE),
[_GAME_NUM] = PLANCK(LAYER_GAME_NUM),
[_CONFIG] = PLANCK(LAYER_CONFIG)
};

3
qmk_nontree.json
View file

@ -1,6 +1,5 @@
{
"nontree_targets": [
"barbellboards",
"planck"
"barbellboards"
]
}

2
users/t4corun/t4corun.h
View file

@ -219,7 +219,7 @@ enum keycodes {
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \
TR_MOUA, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TR_QUOT, \
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TR_COMM, TR_DOT, TR_MINS, \
TR_BTN1, _BASE_L4________, _BASE_R4________, KC_MUTE
TR_BTN1, _BASE_L4________, _BASE_R4________, KC_MUTE
#define LAYER_COLEMAK_DH \