Lefty Touch-Up (#20714)

* rename LAYOUT_all to LAYOUT

* info.json: apply friendly formatting

* refactor keymaps
master
James Young 2023-05-04 13:48:17 -07:00 committed by GitHub
parent 1bb2ed773d
commit a1e4b34aac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 109 additions and 105 deletions

View File

@ -10,45 +10,48 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 0.5, "y": 0}, {"label": "\u2191", "matrix": [0, 0], "x": 0.5, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0}, {"label": "Esc", "matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [0, 2], "x": 3, "y": 0}, {"label": "1", "matrix": [0, 2], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0}, {"label": "2", "matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 4], "x": 5, "y": 0}, {"label": "3", "matrix": [0, 4], "x": 5, "y": 0},
{"matrix": [0, 5], "x": 6, "y": 0}, {"label": "4", "matrix": [0, 5], "x": 6, "y": 0},
{"matrix": [0, 6], "x": 7, "y": 0}, {"label": "5", "matrix": [0, 6], "x": 7, "y": 0},
{"matrix": [0, 7], "x": 8, "y": 0}, {"label": "6", "matrix": [0, 7], "x": 8, "y": 0},
{"matrix": [1, 0], "x": 0.25, "y": 1}, {"label": "\u2193", "matrix": [1, 0], "x": 0.25, "y": 1},
{"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5}, {"label": "Tab", "matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 3.25, "y": 1}, {"label": "Q", "matrix": [1, 2], "x": 3.25, "y": 1},
{"matrix": [1, 3], "x": 4.25, "y": 1}, {"label": "W", "matrix": [1, 3], "x": 4.25, "y": 1},
{"matrix": [1, 4], "x": 5.25, "y": 1}, {"label": "E", "matrix": [1, 4], "x": 5.25, "y": 1},
{"matrix": [1, 5], "x": 6.25, "y": 1}, {"label": "R", "matrix": [1, 5], "x": 6.25, "y": 1},
{"matrix": [1, 6], "x": 7.25, "y": 1}, {"label": "T", "matrix": [1, 6], "x": 7.25, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2}, {"label": "\u2192", "matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, {"label": "Fn", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3.25, "y": 2}, {"label": "A", "matrix": [2, 2], "x": 3.25, "y": 2},
{"matrix": [2, 3], "x": 4.25, "y": 2}, {"label": "S", "matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [2, 4], "x": 5.25, "y": 2}, {"label": "D", "matrix": [2, 4], "x": 5.25, "y": 2},
{"matrix": [2, 5], "x": 6.25, "y": 2}, {"label": "F", "matrix": [2, 5], "x": 6.25, "y": 2},
{"matrix": [2, 6], "x": 7.25, "y": 2}, {"label": "G", "matrix": [2, 6], "x": 7.25, "y": 2},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 3.5, "y": 3}, {"label": "Z", "matrix": [3, 2], "x": 3.5, "y": 3},
{"matrix": [3, 3], "x": 4.5, "y": 3}, {"label": "X", "matrix": [3, 3], "x": 4.5, "y": 3},
{"matrix": [3, 4], "x": 5.5, "y": 3}, {"label": "C", "matrix": [3, 4], "x": 5.5, "y": 3},
{"matrix": [3, 5], "x": 6.5, "y": 3}, {"label": "V", "matrix": [3, 5], "x": 6.5, "y": 3},
{"matrix": [3, 6], "x": 7.5, "y": 3}, {"label": "B", "matrix": [3, 6], "x": 7.5, "y": 3},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25}, {"label": "Alt", "matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
{"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2}, {"label": "Fn2", "matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25} {"label": "Fn3", "matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}
] ]
} }
} }

View File

@ -30,7 +30,7 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_all( [_QWERTY] = LAYOUT(
KC_UP, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_UP, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
KC_DOWN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_DOWN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
KC_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G, KC_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G,
@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, RAISE, SPECIAL KC_LCTL, KC_LALT, RAISE, SPECIAL
), ),
[_LOWER] = LAYOUT_all( [_LOWER] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______ _______, _______, _______, _______
), ),
[_RAISE] = LAYOUT_all( [_RAISE] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -54,11 +54,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______ _______, _______, _______, _______
), ),
[_SPECIAL] = LAYOUT_all( [_SPECIAL] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______ _______, _______, _______, _______
) )
}; };

View File

@ -16,7 +16,6 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum layers { enum layers {
_QWERTY, _QWERTY,
_LOWER, _LOWER,
@ -31,7 +30,7 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_all( [_QWERTY] = LAYOUT(
KC_UP, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_UP, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
KC_DOWN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_DOWN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
KC_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G, KC_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G,
@ -39,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, RAISE, SPECIAL KC_LCTL, KC_LALT, RAISE, SPECIAL
), ),
[_LOWER] = LAYOUT_all( [_LOWER] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -47,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______ _______, _______, _______, _______
), ),
[_RAISE] = LAYOUT_all( [_RAISE] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -55,11 +54,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______ _______, _______, _______, _______
), ),
[_SPECIAL] = LAYOUT_all( [_SPECIAL] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______ _______, _______, _______, _______
) )
}; };