~ruther/qmk_firmware

3aa0a2ec59f3950a2132e158dcc91c1262c088e9 — James Young 2 years ago d40ee2c 
Rartlice: rename LAYOUT_all to LAYOUT (#20800)

* rename LAYOUT_all to LAYOUT

* info.json: apply friendly formatting
patch browse .tar.gz 
3 files changed, 77 insertions(+), 74 deletions(-)

M keyboards/rart/rartlice/info.json
M keyboards/rart/rartlice/keymaps/default/keymap.c
M keyboards/rart/rartlice/keymaps/via/keymap.c

M keyboards/rart/rartlice/info.json => keyboards/rart/rartlice/info.json +71 -68
@@ 25,90 25,93 @@
    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layout_aliases": {
        "LAYOUT_all": "LAYOUT"
    },
    "layouts": {
        "LAYOUT_all": {
        "LAYOUT": {
            "layout": [
                {"matrix": [0, 0], "x": 0, "y": 0},
                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},

                {"matrix": [0, 1], "x": 1.25, "y": 0},
                {"matrix": [0, 2], "x": 2.25, "y": 0},
                {"matrix": [0, 3], "x": 3.25, "y": 0},
                {"matrix": [0, 4], "x": 4.25, "y": 0},
                {"matrix": [1, 4], "x": 5.25, "y": 0},
                {"matrix": [0, 5], "x": 6.25, "y": 0},
                {"matrix": [0, 6], "x": 7.25, "y": 0},
                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
                {"label": "4", "matrix": [1, 4], "x": 5.25, "y": 0},
                {"label": "5", "matrix": [0, 5], "x": 6.25, "y": 0},
                {"label": "6", "matrix": [0, 6], "x": 7.25, "y": 0},

                {"matrix": [0, 7], "x": 9.25, "y": 0},
                {"matrix": [0, 8], "x": 10.25, "y": 0},
                {"matrix": [0, 9], "x": 11.25, "y": 0},
                {"matrix": [0, 10], "x": 12.25, "y": 0},
                {"matrix": [0, 11], "x": 13.25, "y": 0},
                {"matrix": [0, 12], "x": 14.25, "y": 0},
                {"matrix": [0, 13], "x": 15.25, "y": 0},
                {"matrix": [0, 14], "x": 16.25, "y": 0},
                {"label": "7", "matrix": [0, 7], "x": 9.25, "y": 0},
                {"label": "8", "matrix": [0, 8], "x": 10.25, "y": 0},
                {"label": "9", "matrix": [0, 9], "x": 11.25, "y": 0},
                {"label": "0", "matrix": [0, 10], "x": 12.25, "y": 0},
                {"label": "-", "matrix": [0, 11], "x": 13.25, "y": 0},
                {"label": "=", "matrix": [0, 12], "x": 14.25, "y": 0},
                {"label": "`", "matrix": [0, 13], "x": 15.25, "y": 0},
                {"label": "Delete", "matrix": [0, 14], "x": 16.25, "y": 0},

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

                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
                {"matrix": [1, 2], "x": 2.75, "y": 1},
                {"matrix": [1, 3], "x": 3.75, "y": 1},
                {"matrix": [2, 4], "x": 4.75, "y": 1},
                {"matrix": [1, 5], "x": 5.75, "y": 1},
                {"matrix": [1, 6], "x": 6.75, "y": 1},
                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "E", "matrix": [2, 4], "x": 4.75, "y": 1},
                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},

                {"matrix": [1, 7], "x": 8.75, "y": 1},
                {"matrix": [1, 8], "x": 9.75, "y": 1},
                {"matrix": [1, 9], "x": 10.75, "y": 1},
                {"matrix": [1, 10], "x": 11.75, "y": 1},
                {"matrix": [1, 11], "x": 12.75, "y": 1},
                {"matrix": [1, 12], "x": 13.75, "y": 1},
                {"matrix": [1, 13], "x": 14.75, "y": 1},
                {"matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
                {"label": "Backspace", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},

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

                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
                {"matrix": [2, 2], "x": 3, "y": 2},
                {"matrix": [2, 3], "x": 4, "y": 2},
                {"matrix": [3, 4], "x": 5, "y": 2},
                {"matrix": [2, 5], "x": 6, "y": 2},
                {"matrix": [2, 6], "x": 7, "y": 2},
                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "D", "matrix": [3, 4], "x": 5, "y": 2},
                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},

                {"matrix": [2, 7], "x": 9, "y": 2},
                {"matrix": [2, 8], "x": 10, "y": 2},
                {"matrix": [2, 9], "x": 11, "y": 2},
                {"matrix": [2, 10], "x": 12, "y": 2},
                {"matrix": [2, 11], "x": 13, "y": 2},
                {"matrix": [2, 12], "x": 14, "y": 2},
                {"matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
                {"label": "H", "matrix": [2, 7], "x": 9, "y": 2},
                {"label": "J", "matrix": [2, 8], "x": 10, "y": 2},
                {"label": "K", "matrix": [2, 9], "x": 11, "y": 2},
                {"label": "L", "matrix": [2, 10], "x": 12, "y": 2},
                {"label": ";", "matrix": [2, 11], "x": 13, "y": 2},
                {"label": "'", "matrix": [2, 12], "x": 14, "y": 2},
                {"label": "Enter", "matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},

                {"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": [4, 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": [4, 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": [3, 7], "x": 9.5, "y": 3},
                {"matrix": [3, 8], "x": 10.5, "y": 3},
                {"matrix": [3, 9], "x": 11.5, "y": 3},
                {"matrix": [3, 10], "x": 12.5, "y": 3},
                {"matrix": [3, 11], "x": 13.5, "y": 3},
                {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
                {"label": "N", "matrix": [3, 7], "x": 9.5, "y": 3},
                {"label": "M", "matrix": [3, 8], "x": 10.5, "y": 3},
                {"label": ",", "matrix": [3, 9], "x": 11.5, "y": 3},
                {"label": ".", "matrix": [3, 10], "x": 12.5, "y": 3},
                {"label": "/", "matrix": [3, 11], "x": 13.5, "y": 3},
                {"label": "Shift", "matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},

                {"matrix": [3, 14], "x": 16.5, "y": 3.25},
                {"label": "\u2191", "matrix": [3, 14], "x": 16.5, "y": 3.25},

                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
                {"matrix": [4, 6], "x": 7.5, "y": 4},
                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
                {"label": "Alt", "matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
                {"label": "Space", "matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
                {"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4},

                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
                {"label": "Space", "matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},

                {"matrix": [4, 12], "x": 15.5, "y": 4.25},
                {"matrix": [4, 13], "x": 16.5, "y": 4.25},
                {"matrix": [4, 14], "x": 17.5, "y": 4.25}
                {"label": "\u2190", "matrix": [4, 12], "x": 15.5, "y": 4.25},
                {"label": "\u2193", "matrix": [4, 13], "x": 16.5, "y": 4.25},
                {"label": "\u2192", "matrix": [4, 14], "x": 17.5, "y": 4.25}
            ]
        }
    }


M keyboards/rart/rartlice/keymaps/default/keymap.c => keyboards/rart/rartlice/keymaps/default/keymap.c +2 -2
@@ 17,14 17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_all(
  [0] = LAYOUT(
        QK_GESC, 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_GRV,  KC_DEL,
        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_BSPC,
        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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
                 KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
    ),
  [1] = LAYOUT_all(
  [1] = LAYOUT(
        KC_NUM,  RGB_TOG, 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_SCRL, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______, _______,
        _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______,


M keyboards/rart/rartlice/keymaps/via/keymap.c => keyboards/rart/rartlice/keymaps/via/keymap.c +4 -4
@@ 17,28 17,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_all(
  [0] = LAYOUT(
        QK_GESC, 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_GRV,  KC_DEL,
        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_BSPC,
        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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
                 KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
    ),
  [1] = LAYOUT_all(
  [1] = LAYOUT(
        KC_NUM,  RGB_TOG, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,   _______,
        KC_SCRL, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______, _______,
        _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______,
                 _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______,          _______,
                 _______,           _______,          _______, _______,          _______,          _______,          _______, _______, _______
    ),
  [2] = LAYOUT_all(
  [2] = LAYOUT(
        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                 _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
                 _______,           _______,          _______, _______,          _______,          _______,          _______, _______, _______
    ),
  [3] = LAYOUT_all(
  [3] = LAYOUT(
        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,