~ruther/qmk_firmware

ac603aec1dcf4e93e825b3a99e8bf9d673dccd42 — James Young 2 years ago bcc5397
plywrks Lune Layout Touch-Up (#20775)

* add matrix_diagram.md

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_alice_split_bs

* add LAYOUT_alice

* enable Community Layout support
M keyboards/plywrks/lune/info.json => keyboards/plywrks/lune/info.json +167 -79
@@ 18,87 18,175 @@
    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT_all": "LAYOUT_alice_split_bs"
    },
    "community_layouts": [
        "alice",
        "alice_split_bs"
    ],
    "layouts": {
        "LAYOUT_all": {
        "LAYOUT_alice": {
            "layout": [
                {"matrix": [0, 0], "x": 0.5, "y": 0},

                {"matrix": [1, 0], "x": 1.75, "y": 0},
                {"matrix": [0, 1], "x": 2.75, "y": 0},
                {"matrix": [1, 1], "x": 3.75, "y": 0},
                {"matrix": [0, 2], "x": 4.75, "y": 0},
                {"matrix": [1, 2], "x": 5.75, "y": 0},
                {"matrix": [0, 3], "x": 6.75, "y": 0},
                {"matrix": [1, 3], "x": 7.75, "y": 0},

                {"matrix": [0, 4], "x": 10, "y": 0},
                {"matrix": [1, 4], "x": 11, "y": 0},
                {"matrix": [0, 5], "x": 12, "y": 0},
                {"matrix": [1, 5], "x": 13, "y": 0},
                {"matrix": [0, 6], "x": 14, "y": 0},
                {"matrix": [1, 6], "x": 15, "y": 0},
                {"matrix": [0, 7], "x": 16, "y": 0},
                {"matrix": [1, 7], "x": 17, "y": 0},

                {"matrix": [2, 0], "x": 0.25, "y": 1},

                {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
                {"matrix": [2, 1], "x": 3, "y": 1},
                {"matrix": [3, 1], "x": 4, "y": 1},
                {"matrix": [2, 2], "x": 5, "y": 1},
                {"matrix": [3, 2], "x": 6, "y": 1},
                {"matrix": [2, 3], "x": 7, "y": 1},

                {"matrix": [2, 4], "x": 9.5, "y": 1},
                {"matrix": [3, 4], "x": 10.5, "y": 1},
                {"matrix": [2, 5], "x": 11.5, "y": 1},
                {"matrix": [3, 5], "x": 12.5, "y": 1},
                {"matrix": [2, 6], "x": 13.5, "y": 1},
                {"matrix": [3, 6], "x": 14.5, "y": 1},
                {"matrix": [2, 7], "x": 15.5, "y": 1},
                {"matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},

                {"matrix": [4, 0], "x": 0, "y": 2},

                {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
                {"matrix": [4, 1], "x": 3.25, "y": 2},
                {"matrix": [5, 1], "x": 4.25, "y": 2},
                {"matrix": [4, 2], "x": 5.25, "y": 2},
                {"matrix": [5, 2], "x": 6.25, "y": 2},
                {"matrix": [4, 3], "x": 7.25, "y": 2},

                {"matrix": [4, 4], "x": 9.75, "y": 2},
                {"matrix": [5, 4], "x": 10.75, "y": 2},
                {"matrix": [4, 5], "x": 11.75, "y": 2},
                {"matrix": [5, 5], "x": 12.75, "y": 2},
                {"matrix": [4, 6], "x": 13.75, "y": 2},
                {"matrix": [5, 6], "x": 14.75, "y": 2},
                {"matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},

                {"matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
                {"matrix": [6, 1], "x": 3.75, "y": 3},
                {"matrix": [7, 1], "x": 4.75, "y": 3},
                {"matrix": [6, 2], "x": 5.75, "y": 3},
                {"matrix": [7, 2], "x": 6.75, "y": 3},
                {"matrix": [6, 3], "x": 7.75, "y": 3},

                {"matrix": [6, 4], "x": 9.25, "y": 3},
                {"matrix": [7, 4], "x": 10.25, "y": 3},
                {"matrix": [6, 5], "x": 11.25, "y": 3},
                {"matrix": [7, 5], "x": 12.25, "y": 3},
                {"matrix": [6, 6], "x": 13.25, "y": 3},
                {"matrix": [7, 6], "x": 14.25, "y": 3},
                {"matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
                {"matrix": [7, 7], "x": 17, "y": 3},

                {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
                {"matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
                {"matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
                {"matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},

                {"matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
                {"matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
                {"matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
                {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0},

                {"label": "Esc", "matrix": [1, 0], "x": 1.75, "y": 0},
                {"label": "1", "matrix": [0, 1], "x": 2.75, "y": 0},
                {"label": "2", "matrix": [1, 1], "x": 3.75, "y": 0},
                {"label": "3", "matrix": [0, 2], "x": 4.75, "y": 0},
                {"label": "4", "matrix": [1, 2], "x": 5.75, "y": 0},
                {"label": "5", "matrix": [0, 3], "x": 6.75, "y": 0},
                {"label": "6", "matrix": [1, 3], "x": 7.75, "y": 0},

                {"label": "7", "matrix": [0, 4], "x": 10, "y": 0},
                {"label": "8", "matrix": [1, 4], "x": 11, "y": 0},
                {"label": "9", "matrix": [0, 5], "x": 12, "y": 0},
                {"label": "0", "matrix": [1, 5], "x": 13, "y": 0},
                {"label": "-", "matrix": [0, 6], "x": 14, "y": 0},
                {"label": "=", "matrix": [1, 6], "x": 15, "y": 0},
                {"label": "Backspace", "matrix": [1, 7], "x": 16, "y": 0, "w": 2},

                {"label": "Page Up", "matrix": [2, 0], "x": 0.25, "y": 1},

                {"label": "Tab", "matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
                {"label": "Q", "matrix": [2, 1], "x": 3, "y": 1},
                {"label": "W", "matrix": [3, 1], "x": 4, "y": 1},
                {"label": "E", "matrix": [2, 2], "x": 5, "y": 1},
                {"label": "R", "matrix": [3, 2], "x": 6, "y": 1},
                {"label": "T", "matrix": [2, 3], "x": 7, "y": 1},

                {"label": "Y", "matrix": [2, 4], "x": 9.5, "y": 1},
                {"label": "U", "matrix": [3, 4], "x": 10.5, "y": 1},
                {"label": "I", "matrix": [2, 5], "x": 11.5, "y": 1},
                {"label": "O", "matrix": [3, 5], "x": 12.5, "y": 1},
                {"label": "P", "matrix": [2, 6], "x": 13.5, "y": 1},
                {"label": "[", "matrix": [3, 6], "x": 14.5, "y": 1},
                {"label": "]", "matrix": [2, 7], "x": 15.5, "y": 1},
                {"label": "\\", "matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},

                {"label": "Page Down", "matrix": [4, 0], "x": 0, "y": 2},

                {"label": "Caps Lock", "matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
                {"label": "A", "matrix": [4, 1], "x": 3.25, "y": 2},
                {"label": "S", "matrix": [5, 1], "x": 4.25, "y": 2},
                {"label": "D", "matrix": [4, 2], "x": 5.25, "y": 2},
                {"label": "F", "matrix": [5, 2], "x": 6.25, "y": 2},
                {"label": "G", "matrix": [4, 3], "x": 7.25, "y": 2},

                {"label": "H", "matrix": [4, 4], "x": 9.75, "y": 2},
                {"label": "J", "matrix": [5, 4], "x": 10.75, "y": 2},
                {"label": "K", "matrix": [4, 5], "x": 11.75, "y": 2},
                {"label": "L", "matrix": [5, 5], "x": 12.75, "y": 2},
                {"label": ";", "matrix": [4, 6], "x": 13.75, "y": 2},
                {"label": "'", "matrix": [5, 6], "x": 14.75, "y": 2},
                {"label": "Enter", "matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},

                {"label": "Shift", "matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
                {"label": "Z", "matrix": [6, 1], "x": 3.75, "y": 3},
                {"label": "X", "matrix": [7, 1], "x": 4.75, "y": 3},
                {"label": "C", "matrix": [6, 2], "x": 5.75, "y": 3},
                {"label": "V", "matrix": [7, 2], "x": 6.75, "y": 3},
                {"label": "B", "matrix": [6, 3], "x": 7.75, "y": 3},

                {"label": "B", "matrix": [6, 4], "x": 9.25, "y": 3},
                {"label": "N", "matrix": [7, 4], "x": 10.25, "y": 3},
                {"label": "M", "matrix": [6, 5], "x": 11.25, "y": 3},
                {"label": ",", "matrix": [7, 5], "x": 12.25, "y": 3},
                {"label": ".", "matrix": [6, 6], "x": 13.25, "y": 3},
                {"label": "/", "matrix": [7, 6], "x": 14.25, "y": 3},
                {"label": "Shift", "matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
                {"label": "Fn", "matrix": [7, 7], "x": 17, "y": 3},

                {"label": "Ctrl", "matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
                {"label": "Alt", "matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
                {"label": "Space", "matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
                {"label": "Fn", "matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},

                {"label": "Space", "matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
                {"label": "Alt", "matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
                {"label": "Ctrl", "matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
            ]
        },
        "LAYOUT_alice_split_bs": {
            "layout": [
                {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0},

                {"label": "Esc", "matrix": [1, 0], "x": 1.75, "y": 0},
                {"label": "1", "matrix": [0, 1], "x": 2.75, "y": 0},
                {"label": "2", "matrix": [1, 1], "x": 3.75, "y": 0},
                {"label": "3", "matrix": [0, 2], "x": 4.75, "y": 0},
                {"label": "4", "matrix": [1, 2], "x": 5.75, "y": 0},
                {"label": "5", "matrix": [0, 3], "x": 6.75, "y": 0},
                {"label": "6", "matrix": [1, 3], "x": 7.75, "y": 0},

                {"label": "7", "matrix": [0, 4], "x": 10, "y": 0},
                {"label": "8", "matrix": [1, 4], "x": 11, "y": 0},
                {"label": "9", "matrix": [0, 5], "x": 12, "y": 0},
                {"label": "0", "matrix": [1, 5], "x": 13, "y": 0},
                {"label": "-", "matrix": [0, 6], "x": 14, "y": 0},
                {"label": "=", "matrix": [1, 6], "x": 15, "y": 0},
                {"label": "Backspace", "matrix": [0, 7], "x": 16, "y": 0},
                {"label": "Backspace", "matrix": [1, 7], "x": 17, "y": 0},

                {"label": "Page Up", "matrix": [2, 0], "x": 0.25, "y": 1},

                {"label": "Tab", "matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
                {"label": "Q", "matrix": [2, 1], "x": 3, "y": 1},
                {"label": "W", "matrix": [3, 1], "x": 4, "y": 1},
                {"label": "E", "matrix": [2, 2], "x": 5, "y": 1},
                {"label": "R", "matrix": [3, 2], "x": 6, "y": 1},
                {"label": "T", "matrix": [2, 3], "x": 7, "y": 1},

                {"label": "Y", "matrix": [2, 4], "x": 9.5, "y": 1},
                {"label": "U", "matrix": [3, 4], "x": 10.5, "y": 1},
                {"label": "I", "matrix": [2, 5], "x": 11.5, "y": 1},
                {"label": "O", "matrix": [3, 5], "x": 12.5, "y": 1},
                {"label": "P", "matrix": [2, 6], "x": 13.5, "y": 1},
                {"label": "[", "matrix": [3, 6], "x": 14.5, "y": 1},
                {"label": "]", "matrix": [2, 7], "x": 15.5, "y": 1},
                {"label": "\\", "matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},

                {"label": "Page Down", "matrix": [4, 0], "x": 0, "y": 2},

                {"label": "Caps Lock", "matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
                {"label": "A", "matrix": [4, 1], "x": 3.25, "y": 2},
                {"label": "S", "matrix": [5, 1], "x": 4.25, "y": 2},
                {"label": "D", "matrix": [4, 2], "x": 5.25, "y": 2},
                {"label": "F", "matrix": [5, 2], "x": 6.25, "y": 2},
                {"label": "G", "matrix": [4, 3], "x": 7.25, "y": 2},

                {"label": "H", "matrix": [4, 4], "x": 9.75, "y": 2},
                {"label": "J", "matrix": [5, 4], "x": 10.75, "y": 2},
                {"label": "K", "matrix": [4, 5], "x": 11.75, "y": 2},
                {"label": "L", "matrix": [5, 5], "x": 12.75, "y": 2},
                {"label": ";", "matrix": [4, 6], "x": 13.75, "y": 2},
                {"label": "'", "matrix": [5, 6], "x": 14.75, "y": 2},
                {"label": "Enter", "matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},

                {"label": "Shift", "matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
                {"label": "Z", "matrix": [6, 1], "x": 3.75, "y": 3},
                {"label": "X", "matrix": [7, 1], "x": 4.75, "y": 3},
                {"label": "C", "matrix": [6, 2], "x": 5.75, "y": 3},
                {"label": "V", "matrix": [7, 2], "x": 6.75, "y": 3},
                {"label": "B", "matrix": [6, 3], "x": 7.75, "y": 3},

                {"label": "B", "matrix": [6, 4], "x": 9.25, "y": 3},
                {"label": "N", "matrix": [7, 4], "x": 10.25, "y": 3},
                {"label": "M", "matrix": [6, 5], "x": 11.25, "y": 3},
                {"label": ",", "matrix": [7, 5], "x": 12.25, "y": 3},
                {"label": ".", "matrix": [6, 6], "x": 13.25, "y": 3},
                {"label": "/", "matrix": [7, 6], "x": 14.25, "y": 3},
                {"label": "Shift", "matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
                {"label": "Fn", "matrix": [7, 7], "x": 17, "y": 3},

                {"label": "Ctrl", "matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
                {"label": "Alt", "matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
                {"label": "Space", "matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
                {"label": "Fn", "matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},

                {"label": "Space", "matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
                {"label": "Alt", "matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
                {"label": "Ctrl", "matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
            ]
        }
    }

M keyboards/plywrks/lune/keymaps/default/keymap.c => keyboards/plywrks/lune/keymaps/default/keymap.c +2 -2
@@ 16,14 16,14 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
    [0] = LAYOUT_alice_split_bs(
        KC_DEL,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
        KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
        KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
                 KC_LCTL,          KC_LALT, KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                                              KC_RCTL
    ),
    [1] = LAYOUT_all(
    [1] = LAYOUT_alice_split_bs(
        QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
        KC_HOME, _______, _______, KC_UP,   _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
        KC_END,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,

M keyboards/plywrks/lune/keymaps/via/keymap.c => keyboards/plywrks/lune/keymaps/via/keymap.c +4 -4
@@ 16,28 16,28 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
    [0] = LAYOUT_alice_split_bs(
        KC_DEL,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
        KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
        KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
                 KC_LCTL,          KC_LALT, KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                                              KC_RCTL
    ),
    [1] = LAYOUT_all(
    [1] = LAYOUT_alice_split_bs(
        QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
        KC_HOME, _______, _______, KC_UP,   _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
        KC_END,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                 _______,          _______, _______, _______,          _______, _______,                                              _______
    ),
    [2] = LAYOUT_all(
    [2] = LAYOUT_alice_split_bs(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                 _______,          _______, _______, _______,          _______, _______,                                              _______
    ),
    [3] = LAYOUT_all(
    [3] = LAYOUT_alice_split_bs(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

A keyboards/plywrks/lune/matrix_diagram.md => keyboards/plywrks/lune/matrix_diagram.md +15 -0
@@ 0,0 1,15 @@
# Matrix Diagram for plywrks Lune

```
  ┌───┐┌───┬───┬───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
  │00 ││10 │01 │11 │02 │12 │03 │13 │        │04 │14 │05 │15 │06 │16 │07 │17 │   │17     │ 2u Backspace
 ┌┴──┬┼┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘      ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
 │20 ││30   │21 │31 │22 │32 │23 │         │24 │34 │25 │35 │26 │36 │27 │37   │
┌┴──┬┼┴─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
│40 ││50     │41 │51 │42 │52 │43 │         │44 │54 │45 │55 │46 │56 │57      │
└───┘├───────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
     │70       │61 │71 │62 │72 │63 │     │64 │74 │65 │75 │66 │76 │67    │77 │   │67        │ 2.75u RShift
     ├─────┬───┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴──┬───┴─┬─┘   └──────────┘
     │80   │      │81   │82     │83  │   │84        │85   │         │87   │
     └─────┘      └─────┴───────┴────┘   └──────────┴─────┘         └─────┘
```