mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-07-05 11:20:35 -04:00
Fixed a bunch of stuff
- 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:
parent
72d86e4c52
commit
4d5f908817
7 changed files with 64 additions and 65 deletions
|
@ -12,16 +12,16 @@ 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),
|
||||
[_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),
|
||||
|
|
|
@ -19,9 +19,9 @@ 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),
|
||||
[_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),
|
||||
|
|
|
@ -12,16 +12,16 @@ 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),
|
||||
[_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),
|
||||
|
@ -37,9 +37,9 @@ 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
|
||||
[_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
|
||||
|
|
|
@ -19,9 +19,9 @@ 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),
|
||||
[_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),
|
||||
|
|
|
@ -19,9 +19,9 @@ 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),
|
||||
[_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),
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"nontree_targets": [
|
||||
"barbellboards",
|
||||
"planck"
|
||||
"barbellboards"
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue