From 32f060366f4aee7f67692c2fd49f52cd560d2b53 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:47:25 -0700 Subject: [PATCH] Keebio NyquistPad Layout Updates (#22000) * Rename `LAYOUT` to `LAYOUT_ortho_5x6` [refactor] * Add `LAYOUT_ortho_5x6_1x2u` [enhancement] --- keyboards/keebio/nyquistpad/info.json | 50 +++++++++++++++++-- .../nyquistpad/keymaps/default/keymap.c | 6 +-- .../keebio/nyquistpad/keymaps/via/keymap.c | 6 +-- 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/info.json index f8c887bdb8..d999482ef0 100644 --- a/keyboards/keebio/nyquistpad/info.json +++ b/keyboards/keebio/nyquistpad/info.json @@ -32,8 +32,11 @@ "pin": "GP28" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x6" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_5x6": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -41,24 +44,28 @@ {"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 4], "x": 4, "y": 0}, {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [1, 2], "x": 2, "y": 1}, {"matrix": [1, 3], "x": 3, "y": 1}, {"matrix": [1, 4], "x": 4, "y": 1}, {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1, "y": 2}, {"matrix": [2, 2], "x": 2, "y": 2}, {"matrix": [2, 3], "x": 3, "y": 2}, {"matrix": [2, 4], "x": 4, "y": 2}, {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [3, 4], "x": 4, "y": 3}, {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1, "y": 4}, {"matrix": [4, 2], "x": 2, "y": 4}, @@ -66,6 +73,43 @@ {"matrix": [4, 4], "x": 4, "y": 4}, {"matrix": [4, 5], "x": 5, "y": 4} ] + }, + "LAYOUT_ortho_5x6_1x2u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2} + ] } }, "rgb_matrix": { @@ -123,7 +167,6 @@ { "flags": 4, "matrix": [0, 3], "x": 130, "y": 6 }, { "flags": 4, "matrix": [0, 4], "x": 168, "y": 6 }, { "flags": 4, "matrix": [0, 5], "x": 204, "y": 6 }, - { "flags": 4, "matrix": [1, 5], "x": 204, "y": 19 }, { "flags": 2, "x": 186, "y": 12 }, { "flags": 4, "matrix": [1, 4], "x": 168, "y": 19 }, @@ -132,14 +175,12 @@ { "flags": 4, "matrix": [1, 1], "x": 56, "y": 19 }, { "flags": 2, "x": 36, "y": 12 }, { "flags": 4, "matrix": [1, 0], "x": 18, "y": 19 }, - { "flags": 4, "matrix": [2, 0], "x": 18, "y": 32 }, { "flags": 4, "matrix": [2, 1], "x": 56, "y": 32 }, { "flags": 4, "matrix": [2, 2], "x": 92, "y": 32 }, { "flags": 4, "matrix": [2, 3], "x": 130, "y": 32 }, { "flags": 4, "matrix": [2, 4], "x": 168, "y": 32 }, { "flags": 4, "matrix": [2, 5], "x": 204, "y": 32 }, - { "flags": 4, "matrix": [3, 5], "x": 204, "y": 44 }, { "flags": 2, "x": 186, "y": 44 }, { "flags": 4, "matrix": [3, 4], "x": 168, "y": 44 }, @@ -149,7 +190,6 @@ { "flags": 4, "matrix": [3, 1], "x": 56, "y": 44 }, { "flags": 2, "x": 36, "y": 44 }, { "flags": 4, "matrix": [3, 0], "x": 18, "y": 44 }, - { "flags": 4, "matrix": [4, 0], "x": 18, "y": 57 }, { "flags": 4, "matrix": [4, 1], "x": 56, "y": 57 }, { "flags": 4, "matrix": [4, 2], "x": 92, "y": 57 }, diff --git a/keyboards/keebio/nyquistpad/keymaps/default/keymap.c b/keyboards/keebio/nyquistpad/keymaps/default/keymap.c index 42b049facd..42c036556d 100644 --- a/keyboards/keebio/nyquistpad/keymaps/default/keymap.c +++ b/keyboards/keebio/nyquistpad/keymaps/default/keymap.c @@ -5,21 +5,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_5x6( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2), KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_5x6( RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, KC_VOLU, KC_PGUP, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( + [2] = LAYOUT_ortho_5x6( KC_F6, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keebio/nyquistpad/keymaps/via/keymap.c b/keyboards/keebio/nyquistpad/keymaps/via/keymap.c index 42b049facd..42c036556d 100644 --- a/keyboards/keebio/nyquistpad/keymaps/via/keymap.c +++ b/keyboards/keebio/nyquistpad/keymaps/via/keymap.c @@ -5,21 +5,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_5x6( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2), KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_5x6( RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, KC_VOLU, KC_PGUP, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( + [2] = LAYOUT_ortho_5x6( KC_F6, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______,