From b741ec91157f048e413e9caaf296e40e59856988 Mon Sep 17 00:00:00 2001 From: Ryan Neff Date: Sun, 26 Nov 2023 16:55:43 -0800 Subject: [PATCH] Changed layout config name from LAYOUT_split4x6_r1 to LAYOUT --- keyboards/sofle_pico/info.json | 2 +- keyboards/sofle_pico/keymaps/default/keymap.c | 2 +- keyboards/sofle_pico/keymaps/jellytitan/keymap.c | 6 +++--- keyboards/sofle_pico/keymaps/via/keymap.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/sofle_pico/info.json b/keyboards/sofle_pico/info.json index 178e6b882ba..830368a467a 100644 --- a/keyboards/sofle_pico/info.json +++ b/keyboards/sofle_pico/info.json @@ -111,7 +111,7 @@ "processor": "RP2040", "bootloader": "rp2040", "layouts": { - "LAYOUT_split4x6_r1": { + "LAYOUT": { "layout": [ {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7}, {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7}, diff --git a/keyboards/sofle_pico/keymaps/default/keymap.c b/keyboards/sofle_pico/keymaps/default/keymap.c index e340e738c9c..5153cb86a9a 100644 --- a/keyboards/sofle_pico/keymaps/default/keymap.c +++ b/keyboards/sofle_pico/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ -LAYOUT_split4x6_r1( +LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, diff --git a/keyboards/sofle_pico/keymaps/jellytitan/keymap.c b/keyboards/sofle_pico/keymaps/jellytitan/keymap.c index b862a2b909e..1bd0f8dd5ce 100644 --- a/keyboards/sofle_pico/keymaps/jellytitan/keymap.c +++ b/keyboards/sofle_pico/keymaps/jellytitan/keymap.c @@ -68,7 +68,7 @@ │ ← │ → │Esc│Spc│Bsp│ │Ent│Tab│Del│ ↓ │ ↑ │ └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ */ - [_QWERTY] = LAYOUT_split4x6_r1( + [_QWERTY] = LAYOUT( KC_EQL, KC_1, KC_2, KC_3, KC_4, TD5ENT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, LT(1,KC_DEL), LT(2,KC_A), LCTL_T(KC_S), KC_D, LGUI_T(KC_F), KC_G, KC_H, RGUI_T(KC_J), KC_K, RCTL_T(KC_L), LT(2,KC_SCLN), LT(1,KC_QUOT), @@ -92,7 +92,7 @@ └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ */ - [_LOWER] = LAYOUT_split4x6_r1( + [_LOWER] = LAYOUT( 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_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, DT_PRNT, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, DT_UP, KC_4, KC_5, KC_6, KC_PPLS, KC_TRNS, @@ -115,7 +115,7 @@ │___│___│___│___│QMK│ │QMK│___│___│___│___│ └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ */ - [_RAISE] = LAYOUT_split4x6_r1( + [_RAISE] = LAYOUT( RGB_TOG, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, HF_TOGG, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_UP, KC_BTN2, RGB_SAI, RGB_SAD, HF_DWLU, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_VAD, diff --git a/keyboards/sofle_pico/keymaps/via/keymap.c b/keyboards/sofle_pico/keymaps/via/keymap.c index 95c4f9faf64..2f0ab2e9f90 100644 --- a/keyboards/sofle_pico/keymaps/via/keymap.c +++ b/keyboards/sofle_pico/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ For macOS - GUI (cmd) and Alt (opt) swapped */ - [_QWERTY] = LAYOUT_split4x6_r1( + [_QWERTY] = LAYOUT( KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENTER, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ For macOS - GUI (cmd) and Alt (opt) swapped */ - [_COLEMAK_DH] = LAYOUT_split4x6_r1( + [_COLEMAK_DH] = LAYOUT( KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SEMICOLON, KC_ENTER, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOTE, @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │___│___│___│___│___│ │___│___│___│___│___│ └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ */ - [_SYMB] = LAYOUT_split4x6_r1( + [_SYMB] = LAYOUT( 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_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PAST, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_ENTER, KC_BSLS, KC_UNDS, KC_LBRC, KC_LCBR, KC_LPRN, KC_CIRC, KC_PEQL, KC_P4, KC_P5, KC_P6, KC_P0, KC_NUM, @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │___│___│___│___│___│ │___│___│___│___│___│ └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ */ - [_EXT] = LAYOUT_split4x6_r1( + [_EXT] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_TAB), KC_PGUP, KC_END, KC_UP, KC_HOME, _______, KC_BRIU, KC_F7, KC_F8, KC_F9, KC_F10, _______, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, _______, KC_BRID, KC_F4, KC_F5, KC_F6, KC_F11, _______, @@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │___│___│___│___│___│ │___│___│___│___│___│ └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ */ - [_ADJUST] = LAYOUT_split4x6_r1( + [_ADJUST] = LAYOUT( KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, KC_NO, KC_NO, EE_CLR, QK_RBT, DB_TOGG, QK_BOOT, KC_NO, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, RGB_TOG, KC_NO, DF(_QWERTY), DF(_COLEMAK_DH), KC_NO, KC_NO, KC_NO,