From a1e4b34aac5f79bb2bf2539abffc1825223440de Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 4 May 2023 13:48:17 -0700 Subject: [PATCH] Lefty Touch-Up (#20714) * rename LAYOUT_all to LAYOUT * info.json: apply friendly formatting * refactor keymaps --- keyboards/lefty/info.json | 99 ++++++++++++------------ keyboards/lefty/keymaps/default/keymap.c | 57 +++++++------- keyboards/lefty/keymaps/via/keymap.c | 58 +++++++------- 3 files changed, 109 insertions(+), 105 deletions(-) diff --git a/keyboards/lefty/info.json b/keyboards/lefty/info.json index b964980d7d..c7113e4c26 100644 --- a/keyboards/lefty/info.json +++ b/keyboards/lefty/info.json @@ -1,55 +1,58 @@ { - "keyboard_name": "Lefty", - "manufacturer": "SmollChungus", - "url": "https://github.com/smollchungus", - "maintainer": "smollchungus", - "usb": { - "vid": "0x5363", - "pid": "0x0001", - "device_version": "0.0.1" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"matrix": [0, 0], "x": 0.5, "y": 0}, - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, - {"matrix": [0, 5], "x": 6, "y": 0}, - {"matrix": [0, 6], "x": 7, "y": 0}, - {"matrix": [0, 7], "x": 8, "y": 0}, + "keyboard_name": "Lefty", + "manufacturer": "SmollChungus", + "url": "https://github.com/smollchungus", + "maintainer": "smollchungus", + "usb": { + "vid": "0x5363", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "\u2191", "matrix": [0, 0], "x": 0.5, "y": 0}, + {"label": "Esc", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 6, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 8, "y": 0}, - {"matrix": [1, 0], "x": 0.25, "y": 1}, - {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 2], "x": 3.25, "y": 1}, - {"matrix": [1, 3], "x": 4.25, "y": 1}, - {"matrix": [1, 4], "x": 5.25, "y": 1}, - {"matrix": [1, 5], "x": 6.25, "y": 1}, - {"matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "\u2193", "matrix": [1, 0], "x": 0.25, "y": 1}, + {"label": "Tab", "matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 3.25, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 4.25, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 5.25, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 6.25, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 7.25, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, - {"matrix": [2, 2], "x": 3.25, "y": 2}, - {"matrix": [2, 3], "x": 4.25, "y": 2}, - {"matrix": [2, 4], "x": 5.25, "y": 2}, - {"matrix": [2, 5], "x": 6.25, "y": 2}, - {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "\u2192", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Fn", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3.25, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7.25, "y": 2}, - {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 3.5, "y": 3}, - {"matrix": [3, 3], "x": 4.5, "y": 3}, - {"matrix": [3, 4], "x": 5.5, "y": 3}, - {"matrix": [3, 5], "x": 6.5, "y": 3}, - {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.5, "y": 3}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25}, - {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2}, - {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25} - ] + {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25}, + {"label": "Fn2", "matrix": [4, 4], "x": 5.75, "y": 4, "w": 2}, + {"label": "Fn3", "matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25} + ] + } } - } } diff --git a/keyboards/lefty/keymaps/default/keymap.c b/keyboards/lefty/keymaps/default/keymap.c index ecedbac390..e88edb63a5 100644 --- a/keyboards/lefty/keymaps/default/keymap.c +++ b/keyboards/lefty/keymaps/default/keymap.c @@ -30,35 +30,36 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_QWERTY] = LAYOUT_all( - 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_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LCTL, KC_LALT, RAISE, SPECIAL -), + [_QWERTY] = LAYOUT( + 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_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_LCTL, KC_LALT, RAISE, SPECIAL + ), -[_LOWER] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ -), + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), -[_RAISE] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ -), + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), + + [_SPECIAL] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ) -[_SPECIAL] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ -) }; diff --git a/keyboards/lefty/keymaps/via/keymap.c b/keyboards/lefty/keymaps/via/keymap.c index 5acf16c044..e88edb63a5 100644 --- a/keyboards/lefty/keymaps/via/keymap.c +++ b/keyboards/lefty/keymaps/via/keymap.c @@ -16,7 +16,6 @@ #include QMK_KEYBOARD_H - enum layers { _QWERTY, _LOWER, @@ -31,35 +30,36 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_QWERTY] = LAYOUT_all( - 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_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LCTL, KC_LALT, RAISE, SPECIAL -), + [_QWERTY] = LAYOUT( + 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_RGHT, LOWER, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_LCTL, KC_LALT, RAISE, SPECIAL + ), -[_LOWER] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ -), + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), -[_RAISE] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ -), + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), + + [_SPECIAL] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ) -[_SPECIAL] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ -) };