diff options
| author | QMK Bot <hello@qmk.fm> | 2021-11-21 22:39:00 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-11-21 22:39:00 +0000 |
| commit | 8181b155dbfd07561200b30b52a4046f2da92248 (patch) | |
| tree | 31922b96f936d13c3f019248646701f5660b8496 | |
| parent | 79af7046ca9f3b803b38bb2ba84376cae4604fc0 (diff) | |
| parent | e864786c0b64423aa2fa83f2cc8a2049af9957fd (diff) | |
| download | qmk_firmware-8181b155dbfd07561200b30b52a4046f2da92248.tar.gz qmk_firmware-8181b155dbfd07561200b30b52a4046f2da92248.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/ocean/wang_ergo/info.json | 116 | ||||
| -rw-r--r-- | keyboards/ocean/wang_ergo/keymaps/default/keymap.c | 10 | ||||
| -rw-r--r-- | keyboards/ocean/wang_ergo/keymaps/default_2x2u/keymap.c | 24 | ||||
| -rw-r--r-- | keyboards/ocean/wang_ergo/keymaps/via/keymap.c | 40 | ||||
| -rw-r--r-- | keyboards/ocean/wang_ergo/wang_ergo.h | 48 |
5 files changed, 198 insertions, 40 deletions
diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json index 7853de6a4..5ade58c54 100644 --- a/keyboards/ocean/wang_ergo/info.json +++ b/keyboards/ocean/wang_ergo/info.json | |||
| @@ -1,10 +1,114 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "Wang Ergo", | 2 | "keyboard_name": "Wang Ergo", |
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "Ocean", | 4 | "maintainer": "oceeean", |
| 5 | "layout_aliases": { | ||
| 6 | "LAYOUT": "LAYOUT_all" | ||
| 7 | }, | ||
| 5 | "layouts": { | 8 | "layouts": { |
| 6 | "LAYOUT": { | 9 | "LAYOUT_all": { |
| 7 | "layout": [{"label":"0,0", "x":1.75, "y":2.25}, {"label":"0,11", "x":15.15, "y":2.25}, {"label":"3,10", "x":16.15, "y":2.25}, {"label":"1,0", "x":1.5, "y":3.25, "w":1.25}, {"label":"1,11", "x":15.15, "y":3.25, "w":1.75}, {"label":"2,0", "x":1, "y":4.25, "w":1.75}, {"label":"2,11", "x":15.15, "y":4.25, "w":1.25}, {"label":"3,0", "x":0.75, "y":5.25}, {"label":"3,1", "x":1.75, "y":5.25}, {"label":"3,11", "x":15.15, "y":5.25}, {"label":"0,1", "x":3.15, "y":2}, {"label":"1,1", "x":3.15, "y":3}, {"label":"2,1", "x":3.15, "y":4}, {"label":"0,2", "x":4.5, "y":1.75}, {"label":"0,3", "x":5.5, "y":1.75}, {"label":"0,4", "x":6.5, "y":1.75}, {"label":"0,5", "x":7.5, "y":1.75}, {"label":"1,2", "x":4.5, "y":2.75}, {"label":"1,3", "x":5.5, "y":2.75}, {"label":"1,4", "x":6.5, "y":2.75}, {"label":"1,5", "x":7.5, "y":2.75}, {"label":"2,2", "x":4.5, "y":3.75}, {"label":"2,3", "x":5.5, "y":3.75}, {"label":"2,4", "x":6.5, "y":3.75}, {"label":"2,5", "x":7.5, "y":3.75}, {"label":"3,3", "x":5.5, "y":4.75}, {"label":"3,4", "x":6.5, "y":4.75}, {"label":"3,5", "x":7.5, "y":4.75}, {"label":"0,6", "x":9.25, "y":4.25}, {"label":"0,7", "x":10.25, "y":4.25}, {"label":"0,8", "x":11.25, "y":4.25}, {"label":"0,9", "x":12.25, "y":4.25}, {"label":"1,6", "x":9.25, "y":5.25}, {"label":"1,7", "x":10.25, "y":5.25}, {"label":"1,8", "x":11.25, "y":5.25}, {"label":"1,9", "x":12.25, "y":5.25}, {"label":"2,6", "x":9.25, "y":6.25}, {"label":"2,7", "x":10.25, "y":6.25}, {"label":"2,8", "x":11.25, "y":6.25}, {"label":"2,9", "x":12.25, "y":6.25}, {"label":"3,6", "x":9.25, "y":7.25}, {"label":"3,7", "x":10.25, "y":7.25}, {"label":"3,8", "x":11.25, "y":7.25}, {"label":"0,10", "x":13.75, "y":3.25}, {"label":"1,10", "x":13.75, "y":4.25}, {"label":"2,10", "x":13.75, "y":5.25}] | 10 | "layout": [ |
| 11 | {"label":"Esc", "x":1, "y":0}, | ||
| 12 | {"label":"Q", "x":2, "y":0}, | ||
| 13 | {"label":"W", "x":3, "y":0}, | ||
| 14 | {"label":"E", "x":4, "y":0}, | ||
| 15 | {"label":"R", "x":5, "y":0}, | ||
| 16 | {"label":"T", "x":6, "y":0}, | ||
| 17 | {"label":"Y", "x":8, "y":0}, | ||
| 18 | {"label":"U", "x":9, "y":0}, | ||
| 19 | {"label":"I", "x":10, "y":0}, | ||
| 20 | {"label":"O", "x":11, "y":0}, | ||
| 21 | {"label":"P", "x":12, "y":0}, | ||
| 22 | {"label":"Del", "x":13, "y":0}, | ||
| 23 | {"label":"Backspace", "x":14, "y":0}, | ||
| 24 | |||
| 25 | {"label":"Tab", "x":0.75, "y":1, "w":1.25}, | ||
| 26 | {"label":"A", "x":2, "y":1}, | ||
| 27 | {"label":"S", "x":3, "y":1}, | ||
| 28 | {"label":"D", "x":4, "y":1}, | ||
| 29 | {"label":"F", "x":5, "y":1}, | ||
| 30 | {"label":"G", "x":6, "y":1}, | ||
| 31 | {"label":"H", "x":8, "y":1}, | ||
| 32 | {"label":"J", "x":9, "y":1}, | ||
| 33 | {"label":"K", "x":10, "y":1}, | ||
| 34 | {"label":"L", "x":11, "y":1}, | ||
| 35 | {"label":";:", "x":12, "y":1}, | ||
| 36 | {"label":"Enter", "x":13, "y":1, "w":1.75}, | ||
| 37 | |||
| 38 | {"label":"Shift", "x":0.25, "y":2, "w":1.75}, | ||
| 39 | {"label":"Z", "x":2, "y":2}, | ||
| 40 | {"label":"X", "x":3, "y":2}, | ||
| 41 | {"label":"C", "x":4, "y":2}, | ||
| 42 | {"label":"V", "x":5, "y":2}, | ||
| 43 | {"label":"B", "x":6, "y":2}, | ||
| 44 | {"label":"N", "x":8, "y":2}, | ||
| 45 | {"label":"M", "x":9, "y":2}, | ||
| 46 | {"label":",<", "x":10, "y":2}, | ||
| 47 | {"label":".>", "x":11, "y":2}, | ||
| 48 | {"label":"/?", "x":12, "y":2}, | ||
| 49 | {"label":"Fn", "x":13, "y":2, "w":1.25}, | ||
| 50 | |||
| 51 | {"label":"Ctrl", "x":0, "y":3}, | ||
| 52 | {"label":"GUI", "x":1, "y":3}, | ||
| 53 | {"label":"Alt", "x":4, "y":3}, | ||
| 54 | {"label":"Space", "x":5, "y":3}, | ||
| 55 | {"label":"Space", "x":6, "y":3}, | ||
| 56 | {"label":"Space", "x":8, "y":3}, | ||
| 57 | {"label":"Space", "x":9, "y":3}, | ||
| 58 | {"label":"Alt", "x":10, "y":3}, | ||
| 59 | {"label":"Ctrl", "x":13, "y":3} | ||
| 60 | ] | ||
| 61 | }, | ||
| 62 | "LAYOUT_2x2u": { | ||
| 63 | "layout": [ | ||
| 64 | {"label":"Esc", "x":1, "y":0}, | ||
| 65 | {"label":"Q", "x":2, "y":0}, | ||
| 66 | {"label":"W", "x":3, "y":0}, | ||
| 67 | {"label":"E", "x":4, "y":0}, | ||
| 68 | {"label":"R", "x":5, "y":0}, | ||
| 69 | {"label":"T", "x":6, "y":0}, | ||
| 70 | {"label":"Y", "x":8, "y":0}, | ||
| 71 | {"label":"U", "x":9, "y":0}, | ||
| 72 | {"label":"I", "x":10, "y":0}, | ||
| 73 | {"label":"O", "x":11, "y":0}, | ||
| 74 | {"label":"P", "x":12, "y":0}, | ||
| 75 | {"label":"Del", "x":13, "y":0}, | ||
| 76 | {"label":"Backspace", "x":14, "y":0}, | ||
| 77 | |||
| 78 | {"label":"Tab", "x":0.75, "y":1, "w":1.25}, | ||
| 79 | {"label":"A", "x":2, "y":1}, | ||
| 80 | {"label":"S", "x":3, "y":1}, | ||
| 81 | {"label":"D", "x":4, "y":1}, | ||
| 82 | {"label":"F", "x":5, "y":1}, | ||
| 83 | {"label":"G", "x":6, "y":1}, | ||
| 84 | {"label":"H", "x":8, "y":1}, | ||
| 85 | {"label":"J", "x":9, "y":1}, | ||
| 86 | {"label":"K", "x":10, "y":1}, | ||
| 87 | {"label":"L", "x":11, "y":1}, | ||
| 88 | {"label":";:", "x":12, "y":1}, | ||
| 89 | {"label":"Enter", "x":13, "y":1, "w":1.75}, | ||
| 90 | |||
| 91 | {"label":"Shift", "x":0.25, "y":2, "w":1.75}, | ||
| 92 | {"label":"Z", "x":2, "y":2}, | ||
| 93 | {"label":"X", "x":3, "y":2}, | ||
| 94 | {"label":"C", "x":4, "y":2}, | ||
| 95 | {"label":"V", "x":5, "y":2}, | ||
| 96 | {"label":"B", "x":6, "y":2}, | ||
| 97 | {"label":"N", "x":8, "y":2}, | ||
| 98 | {"label":"M", "x":9, "y":2}, | ||
| 99 | {"label":",<", "x":10, "y":2}, | ||
| 100 | {"label":".>", "x":11, "y":2}, | ||
| 101 | {"label":"/?", "x":12, "y":2}, | ||
| 102 | {"label":"Fn", "x":13, "y":2, "w":1.25}, | ||
| 103 | |||
| 104 | {"label":"Ctrl", "x":0, "y":3}, | ||
| 105 | {"label":"GUI", "x":1, "y":3}, | ||
| 106 | {"label":"Alt", "x":4, "y":3}, | ||
| 107 | {"label":"Space", "x":5, "y":3, "w":2}, | ||
| 108 | {"label":"Space", "x":8, "y":3, "w":2}, | ||
| 109 | {"label":"Alt", "x":10, "y":3}, | ||
| 110 | {"label":"Ctrl", "x":13, "y":3} | ||
| 111 | ] | ||
| 8 | } | 112 | } |
| 9 | } | 113 | } |
| 10 | } \ No newline at end of file | 114 | } |
diff --git a/keyboards/ocean/wang_ergo/keymaps/default/keymap.c b/keyboards/ocean/wang_ergo/keymaps/default/keymap.c index 623f574cd..a50dde256 100644 --- a/keyboards/ocean/wang_ergo/keymaps/default/keymap.c +++ b/keyboards/ocean/wang_ergo/keymaps/default/keymap.c | |||
| @@ -15,10 +15,10 @@ | |||
| 15 | #include QMK_KEYBOARD_H | 15 | #include QMK_KEYBOARD_H |
| 16 | 16 | ||
| 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 18 | [0] = LAYOUT( | 18 | [0] = LAYOUT_all( |
| 19 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, | 19 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, |
| 20 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, | 20 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, |
| 21 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(1), | 21 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(1), |
| 22 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_BSPC, KC_RCTL | 22 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL |
| 23 | ), | 23 | ), |
| 24 | }; | 24 | }; |
diff --git a/keyboards/ocean/wang_ergo/keymaps/default_2x2u/keymap.c b/keyboards/ocean/wang_ergo/keymaps/default_2x2u/keymap.c new file mode 100644 index 000000000..7177819e4 --- /dev/null +++ b/keyboards/ocean/wang_ergo/keymaps/default_2x2u/keymap.c | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /* Copyright 2021 Ocean | ||
| 2 | * This program is free software: you can redistribute it and/or modify | ||
| 3 | * it under the terms of the GNU General Public License as published by | ||
| 4 | * the Free Software Foundation, either version 2 of the License, or | ||
| 5 | * (at your option) any later version. | ||
| 6 | * | ||
| 7 | * This program is distributed in the hope that it will be useful, | ||
| 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 10 | * GNU General Public License for more details. | ||
| 11 | * | ||
| 12 | * You should have received a copy of the GNU General Public License | ||
| 13 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 14 | */ | ||
| 15 | #include QMK_KEYBOARD_H | ||
| 16 | |||
| 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 18 | [0] = LAYOUT_2x2u( | ||
| 19 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, | ||
| 20 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, | ||
| 21 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(1), | ||
| 22 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL | ||
| 23 | ), | ||
| 24 | }; | ||
diff --git a/keyboards/ocean/wang_ergo/keymaps/via/keymap.c b/keyboards/ocean/wang_ergo/keymaps/via/keymap.c index 431dac64e..c13785686 100644 --- a/keyboards/ocean/wang_ergo/keymaps/via/keymap.c +++ b/keyboards/ocean/wang_ergo/keymaps/via/keymap.c | |||
| @@ -15,31 +15,31 @@ | |||
| 15 | #include QMK_KEYBOARD_H | 15 | #include QMK_KEYBOARD_H |
| 16 | 16 | ||
| 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 18 | [0] = LAYOUT( | 18 | [0] = LAYOUT_all( |
| 19 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, | 19 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, |
| 20 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, | 20 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, |
| 21 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(1), | 21 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(1), |
| 22 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_BSPC, KC_RCTL | 22 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL |
| 23 | ), | 23 | ), |
| 24 | 24 | ||
| 25 | [1] = LAYOUT( | 25 | [1] = LAYOUT_all( |
| 26 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 26 | 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, |
| 27 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 27 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 30 | ), | 30 | ), |
| 31 | 31 | ||
| 32 | [2] = LAYOUT( | 32 | [2] = LAYOUT_all( |
| 33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 33 | 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, |
| 34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 37 | ), | 37 | ), |
| 38 | 38 | ||
| 39 | [3] = LAYOUT( | 39 | [3] = LAYOUT_all( |
| 40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 40 | 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, |
| 41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 43 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 43 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 44 | ), | 44 | ), |
| 45 | }; | 45 | }; |
diff --git a/keyboards/ocean/wang_ergo/wang_ergo.h b/keyboards/ocean/wang_ergo/wang_ergo.h index c57cc6c67..68074c299 100644 --- a/keyboards/ocean/wang_ergo/wang_ergo.h +++ b/keyboards/ocean/wang_ergo/wang_ergo.h | |||
| @@ -17,15 +17,45 @@ | |||
| 17 | 17 | ||
| 18 | #include "quantum.h" | 18 | #include "quantum.h" |
| 19 | 19 | ||
| 20 | #define LAYOUT(\ | 20 | #define XXX KC_NO |
| 21 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ | 21 | |
| 22 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ | 22 | /* |
| 23 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ | 23 | * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ |
| 24 | K30, K31, K33, K34, K35, K36, K37, K38, K3A, K3B \ | 24 | * │00 │01 │02 │03 │04 │05 │ │06 │07 │08 │09 │0A │0B │3A │ |
| 25 | * ┌┴───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┴──┬┘ | ||
| 26 | * │10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │ | ||
| 27 | * ┌─┴────┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼────┬─┘ | ||
| 28 | * │20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │ | ||
| 29 | * ┌┴──┬───┼───┴───┼───┼───┼───┤ ├───┼───┼───┼───┴───┼───┬┘ | ||
| 30 | * │30 │31 │ │33 │34 │35 │ │36 │37 │38 │ │3B │ | ||
| 31 | * └───┴───┘ └───┴───┴───┘ └───┴───┴───┘ └───┘ | ||
| 32 | * ┌───────┐ ┌───────┐ | ||
| 33 | * │35 │ │36 │ | ||
| 34 | * └───────┘ └───────┘ | ||
| 35 | */ | ||
| 36 | |||
| 37 | #define LAYOUT_all(\ | ||
| 38 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K3A, \ | ||
| 39 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ | ||
| 40 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ | ||
| 41 | K30, K31, K33, K34, K35, K36, K37, K38, K3B \ | ||
| 42 | ) \ | ||
| 43 | { \ | ||
| 44 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ | ||
| 45 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ | ||
| 46 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ | ||
| 47 | { K30, K31, XXX, K33, K34, K35, K36, K37, K38, XXX, K3A, K3B }, \ | ||
| 48 | } | ||
| 49 | |||
| 50 | #define LAYOUT_2x2u(\ | ||
| 51 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K3A, \ | ||
| 52 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ | ||
| 53 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ | ||
| 54 | K30, K31, K33, K35, K36, K38, K3B \ | ||
| 25 | ) \ | 55 | ) \ |
| 26 | { \ | 56 | { \ |
| 27 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ | 57 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ |
| 28 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ | 58 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ |
| 29 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ | 59 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ |
| 30 | { K30, K31, KC_NO, K33, K34, K35, K36, K37, K38, KC_NO, K3A, K3B }, \ | 60 | { K30, K31, XXX, K33, XXX, K35, K36, XXX, K38, XXX, K3A, K3B }, \ |
| 31 | } | 61 | } |
