Skip to content

Commit

Permalink
Frooastside Walnut Community Layout Support (qmk#17112)
Browse files Browse the repository at this point in the history 
* LAYOUT_iso: move Enter to home row

This commit makes the layout macro compatible with QMK's `tkl_nofrow_iso` Community Layout.

* rename LAYOUT_ansi to LAYOUT_tkl_nofrow_ansi

* rename LAYOUT_iso to LAYOUT_tkl_nofrow_iso

* enable Community Layout support
  • Loading branch information
@noroadsleft @zykrah
noroadsleft authored and zykrah committed Jul 2, 2022
1 parent f76e3d1 commit f47d588
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
11 changes: 8 additions & 3 deletions keyboards/frooastboard/walnut/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@
"pid": "0x776E",
"device_version": "1.0.0"
},
"community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"],
"layout_aliases": {
"LAYOUT_ansi": "LAYOUT_tkl_nofrow_ansi",
"LAYOUT_iso": "LAYOUT_tkl_nofrow_iso"
},
"layouts": {
"LAYOUT_ansi": {
"LAYOUT_tkl_nofrow_ansi": {
"layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 },
Expand Down Expand Up @@ -103,7 +108,7 @@
{ "matrix": [1, 7], "x": 17.5, "y": 4 }
]
},
"LAYOUT_iso": {
"LAYOUT_tkl_nofrow_iso": {
"layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 },
Expand Down Expand Up @@ -135,7 +140,6 @@
{ "matrix": [3, 2], "x": 10.5, "y": 1 },
{ "matrix": [3, 3], "x": 11.5, "y": 1 },
{ "matrix": [3, 4], "x": 12.5, "y": 1 },
{ "matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
{ "matrix": [7, 5], "x": 15.5, "y": 1 },
{ "matrix": [7, 6], "x": 16.5, "y": 1 },
{ "matrix": [7, 7], "x": 17.5, "y": 1 },
Expand All @@ -152,6 +156,7 @@
{ "matrix": [5, 2], "x": 10.75, "y": 2 },
{ "matrix": [5, 3], "x": 11.75, "y": 2 },
{ "matrix": [5, 4], "x": 12.75, "y": 2 },
{ "matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
{ "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 },
{ "matrix": [6, 1], "x": 1.25, "y": 3 },
{ "matrix": [6, 2], "x": 2.25, "y": 3 },
Expand Down
4 changes: 2 additions & 2 deletions keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ansi(
[0] = LAYOUT_tkl_nofrow_ansi(
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_INS, KC_HOME, 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_DEL, KC_END, 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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT_ansi(
[1] = LAYOUT_tkl_nofrow_ansi(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
Expand Down
12 changes: 6 additions & 6 deletions keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_iso(
[0] = LAYOUT_tkl_nofrow_iso(
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_INS, KC_HOME, 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_ENT, KC_DEL, KC_END, 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_BSLS,
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_DEL, KC_END, 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_BSLS, KC_ENT,
KC_LSFT, KC_NUBS, 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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT_iso(
[1] = LAYOUT_tkl_nofrow_iso(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI,
KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD)
};

0 comments on commit f47d588

Please sign in to comment.