diff options
Diffstat (limited to 'keyboards/nopunin10did/jabberwocky/v1')
-rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/config.h | 8 | ||||
-rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/info.json | 236 | ||||
-rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/v1.c | 17 |
3 files changed, 123 insertions, 138 deletions
diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h index bec3df0189..1eb25da282 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/config.h +++ b/keyboards/nopunin10did/jabberwocky/v1/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json index bbf52486b9..175e57253b 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/info.json +++ b/keyboards/nopunin10did/jabberwocky/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x4A57", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "D7", "C6", "D4", "D0", "D2", "D3"], + "rows": ["E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "num_lock": "D1" @@ -17,119 +22,124 @@ "layouts": { "LAYOUT_rh": { "layout": [ - {"x":0.75, "y":0.25, "label":"Esc"}, - {"x":2.25, "y":0.25, "label":"F1"}, - {"x":3.25, "y":0.25, "label":"F2"}, - {"x":4.25, "y":0.25, "r":14, "rx":4, "ry":2.5, "label":"F3"}, - {"x":5.25, "y":0.125, "r":14, "rx":4, "ry":2.5, "label":"F4"}, - {"x":6.25, "y":0.25, "r":14, "rx":4, "ry":2.5, "label":"F5"}, - {"x":7.25, "y":0.375, "r":14, "rx":4, "ry":2.5, "label":"F6"}, - {"x":10.25, "y":0.375, "r":-14, "rx":13.25, "ry":2.5, "label":"F7"}, - {"x":11.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5, "label":"F8"}, - {"x":12.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5, "label":"F9"}, - {"x":13.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5, "label":"F10"}, - {"x":14.25, "y":0.25, "label":"F11"}, - {"x":15.25, "y":0.25, "label":"F12"}, - {"x":16.375, "y":0.25, "label":"Print"}, - {"x":17.375, "y":0.25, "label":"Scroll"}, - {"x":18.5, "y":0.25, "label":"Ins"}, - {"x":19.5, "y":0.25, "label":"Del"}, - {"x":20.75, "y":0.25, "label":"Home"}, - {"x":21.75, "y":0.25, "label":"End"}, - {"x":22.75, "y":0.25, "label":"PgUp"}, - {"x":23.75, "y":0.25, "label":"PgDn"}, - {"x":2, "y":1.5, "label":"Grave"}, - {"x":3, "y":1.5, "label":"1"}, - {"x":4.25, "y":1.5, "r":14, "rx":4, "ry":2.5, "label":"2"}, - {"x":5.25, "y":1.375, "r":14, "rx":4, "ry":2.5, "label":"3"}, - {"x":6.25, "y":1.5, "r":14, "rx":4, "ry":2.5, "label":"4"}, - {"x":7.25, "y":1.625, "r":14, "rx":4, "ry":2.5, "label":"5"}, - {"x":10.25, "y":1.625, "r":-14, "rx":13.25, "ry":2.5, "label":"6"}, - {"x":11.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5, "label":"7"}, - {"x":12.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5, "label":"8"}, - {"x":13.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5, "label":"9"}, - {"x":14.5, "y":1.5, "label":"0"}, - {"x":15.5, "y":1.5, "label":"Dash"}, - {"x":16.5, "y":1.5, "label":"Equals"}, - {"x":17.5, "y":1.5, "label":"Backspace"}, - {"x":18.5, "y":1.5, "label":"Split BS"}, - {"x":20.75, "y":1.5, "label":"NumLock"}, - {"x":21.75, "y":1.5, "label":"P-Div"}, - {"x":22.75, "y":1.5, "label":"P-Mult"}, - {"x":23.75, "y":1.5, "label":"Pause"}, - {"x":1.25, "y":2.5, "w":1.5, "label":"Tab"}, - {"x":2.75, "y":2.5, "label":"Q"}, - {"x":4.25, "y":2.5, "r":14, "rx":4, "ry":2.5, "label":"W"}, - {"x":5.25, "y":2.375, "r":14, "rx":4, "ry":2.5, "label":"E"}, - {"x":6.25, "y":2.5, "r":14, "rx":4, "ry":2.5, "label":"R"}, - {"x":7.25, "y":2.625, "r":14, "rx":4, "ry":2.5, "label":"T"}, - {"x":10.25, "y":2.625, "r":-14, "rx":13.25, "ry":2.5, "label":"y"}, - {"x":11.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5, "label":"U"}, - {"x":12.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5, "label":"I"}, - {"x":13.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5, "label":"O"}, - {"x":14.75, "y":2.5, "label":"P"}, - {"x":15.75, "y":2.5, "label":"L bracket"}, - {"x":16.75, "y":2.5, "label":"R bracket"}, - {"x":17.75, "y":2.5, "w":1.5, "label":"ANSI Backslash"}, - {"x":20.75, "y":2.5, "label":"P-7"}, - {"x":21.75, "y":2.5, "label":"P-8"}, - {"x":22.75, "y":2.5, "label":"P-9"}, - {"x":23.75, "y":2.5, "label":"P-Minus"}, - {"x":0.75, "y":3.5, "w":1.75, "label":"Caps Lock"}, - {"x":2.5, "y":3.5, "label":"A"}, - {"x":4.25, "y":3.5, "r":14, "rx":4, "ry":2.5, "label":"S"}, - {"x":5.25, "y":3.375, "r":14, "rx":4, "ry":2.5, "label":"D"}, - {"x":6.25, "y":3.5, "r":14, "rx":4, "ry":2.5, "label":"F"}, - {"x":7.25, "y":3.625, "r":14, "rx":4, "ry":2.5, "label":"G"}, - {"x":10.25, "y":3.625, "r":-14, "rx":13.25, "ry":2.5, "label":"H"}, - {"x":11.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5, "label":"J"}, - {"x":12.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5, "label":"K"}, - {"x":13.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5, "label":"L"}, - {"x":15, "y":3.5, "label":"Semicolon"}, - {"x":16, "y":3.5, "label":"Quote"}, - {"x":17, "y":3.5, "label":"Non-US Hash"}, - {"x":18, "y":3.5, "w":1.25, "label":"Enter"}, - {"x":20.75, "y":3.5, "label":"P-4"}, - {"x":21.75, "y":3.5, "label":"P-5"}, - {"x":22.75, "y":3.5, "label":"P-6"}, - {"x":23.75, "y":3.5, "label":"P-Plus"}, - {"x":0, "y":4.5, "w":1.25, "label":"Left Shift"}, - {"x":1.25, "y":4.5, "label":"Non-US Backslash"}, - {"x":2.25, "y":4.5, "label":"Z"}, - {"x":4.25, "y":4.5, "r":14, "rx":4, "ry":2.5, "label":"X"}, - {"x":5.25, "y":4.375, "r":14, "rx":4, "ry":2.5, "label":"C"}, - {"x":6.25, "y":4.5, "r":14, "rx":4, "ry":2.5, "label":"V"}, - {"x":7.25, "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"B"}, - {"x":8.25, "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"Layer"}, - {"x":9.25, "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"Layer"}, - {"x":10.25, "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"N"}, - {"x":11.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5, "label":"M"}, - {"x":12.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5, "label":"Comma"}, - {"x":13.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5, "label":"Period"}, - {"x":15.25, "y":4.5, "label":"Slash"}, - {"x":16.25, "y":4.5, "label":"JIS Backslash"}, - {"x":17.25, "y":4.5, "w":1.25, "label":"Right Shift"}, - {"x":18.5, "y":4.5, "label":"Up"}, - {"x":20.75, "y":4.5, "label":"P-1"}, - {"x":21.75, "y":4.5, "label":"P-2"}, - {"x":22.75, "y":4.5, "label":"P-3"}, - {"x":23.75, "y":4.5, "label":"P-Enter"}, - {"x":0.5, "y":5.5, "w":1.25, "label":"Left Ctrl"}, - {"x":1.75, "y":5.5, "w":1.25, "label":"Left GUI"}, - {"x":4.75, "y":5.5, "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Left Alt"}, - {"x":6, "y":5.5, "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Menu"}, - {"x":7.25, "y":5.625, "w":2, "r":14, "rx":4, "ry":2.5, "label":"Space"}, - {"x":9.25, "y":5.625, "w":2.75, "r":-14, "rx":13.25, "ry":2.5, "label":"Space"}, - {"x":12, "y":5.5, "w":1.25, "r":-14, "rx":13.25, "ry":2.5, "label":"Right Alt"}, - {"x":15, "y":5.5, "w":1.25, "label":"Right GUI"}, - {"x":16.25, "y":5.5, "w":1.25, "label":"Right Ctrl"}, - {"x":17.5, "y":5.5, "label":"Left"}, - {"x":18.5, "y":5.5, "label":"Down"}, - {"x":19.5, "y":5.5, "label":"Right"}, - {"x":20.75, "y":5.5, "label":"P-0"}, - {"x":21.75, "y":5.5, "label":"P-00"}, - {"x":22.75, "y":5.5, "label":"P-Decimal"}, - {"x":23.75, "y":5.5, "label":"P-Enter"} + {"x":0.75, "y":0.125}, + {"x":2.25, "y":0.125}, + {"x":3.25, "y":0.125}, + {"x":4.25, "y":0.125, "r":14, "rx":4, "ry":2.5}, + {"x":5.25, "y":0, "r":14, "rx":4, "ry":2.5}, + {"x":6.25, "y":0.125, "r":14, "rx":4, "ry":2.5}, + {"x":7.25, "y":0.25, "r":14, "rx":4, "ry":2.5}, + {"x":10.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5}, + {"x":11.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5}, + {"x":12.25, "y":0, "r":-14, "rx":13.25, "ry":2.5}, + {"x":13.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5}, + {"x":14.25, "y":0.125}, + {"x":15.25, "y":0.125}, + {"x":16.375, "y":0.125}, + {"x":17.375, "y":0.125}, + {"x":18.5, "y":0.125}, + {"x":19.5, "y":0.125}, + {"x":20.75, "y":0.125}, + {"x":21.75, "y":0.125}, + {"x":22.75, "y":0.125}, + {"x":23.75, "y":0.125}, + + {"x":2, "y":1.375}, + {"x":3, "y":1.375}, + {"x":4.25, "y":1.375, "r":14, "rx":4, "ry":2.5}, + {"x":5.25, "y":1.25, "r":14, "rx":4, "ry":2.5}, + {"x":6.25, "y":1.375, "r":14, "rx":4, "ry":2.5}, + {"x":7.25, "y":1.5, "r":14, "rx":4, "ry":2.5}, + {"x":10.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5}, + {"x":11.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":12.25, "y":1.25, "r":-14, "rx":13.25, "ry":2.5}, + {"x":13.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":14.5, "y":1.375}, + {"x":15.5, "y":1.375}, + {"x":16.5, "y":1.375}, + {"x":17.5, "y":1.375}, + {"x":18.5, "y":1.375}, + {"x":20.75, "y":1.375}, + {"x":21.75, "y":1.375}, + {"x":22.75, "y":1.375}, + {"x":23.75, "y":1.375}, + + {"x":1.25, "y":2.375, "w":1.5}, + {"x":2.75, "y":2.375}, + {"x":4.25, "y":2.375, "r":14, "rx":4, "ry":2.5}, + {"x":5.25, "y":2.25, "r":14, "rx":4, "ry":2.5}, + {"x":6.25, "y":2.375, "r":14, "rx":4, "ry":2.5}, + {"x":7.25, "y":2.5, "r":14, "rx":4, "ry":2.5}, + {"x":10.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5}, + {"x":11.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":12.25, "y":2.25, "r":-14, "rx":13.25, "ry":2.5}, + {"x":13.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":14.75, "y":2.375}, + {"x":15.75, "y":2.375}, + {"x":16.75, "y":2.375}, + {"x":17.75, "y":2.375, "w":1.5}, + {"x":20.75, "y":2.375}, + {"x":21.75, "y":2.375}, + {"x":22.75, "y":2.375}, + {"x":23.75, "y":2.375}, + + {"x":0.75, "y":3.375, "w":1.75}, + {"x":2.5, "y":3.375}, + {"x":4.25, "y":3.375, "r":14, "rx":4, "ry":2.5}, + {"x":5.25, "y":3.25, "r":14, "rx":4, "ry":2.5}, + {"x":6.25, "y":3.375, "r":14, "rx":4, "ry":2.5}, + {"x":7.25, "y":3.5, "r":14, "rx":4, "ry":2.5}, + {"x":10.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5}, + {"x":11.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":12.25, "y":3.25, "r":-14, "rx":13.25, "ry":2.5}, + {"x":13.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":15, "y":3.375}, + {"x":16, "y":3.375}, + {"x":17, "y":3.375}, + {"x":18, "y":3.375, "w":1.25}, + {"x":20.75, "y":3.375}, + {"x":21.75, "y":3.375}, + {"x":22.75, "y":3.375}, + {"x":23.75, "y":3.375}, + + {"x":0, "y":4.375, "w":1.25}, + {"x":1.25, "y":4.375}, + {"x":2.25, "y":4.375}, + {"x":4.25, "y":4.375, "r":14, "rx":4, "ry":2.5}, + {"x":5.25, "y":4.25, "r":14, "rx":4, "ry":2.5}, + {"x":6.25, "y":4.375, "r":14, "rx":4, "ry":2.5}, + {"x":7.25, "y":4.5, "r":14, "rx":4, "ry":2.5}, + {"x":8.25, "y":4.5, "r":14, "rx":4, "ry":2.5}, + {"x":9.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5}, + {"x":10.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5}, + {"x":11.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":12.25, "y":4.25, "r":-14, "rx":13.25, "ry":2.5}, + {"x":13.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5}, + {"x":15.25, "y":4.375}, + {"x":16.25, "y":4.375}, + {"x":17.25, "y":4.375, "w":1.25}, + {"x":18.5, "y":4.375}, + {"x":20.75, "y":4.375}, + {"x":21.75, "y":4.375}, + {"x":22.75, "y":4.375}, + {"x":23.75, "y":4.375}, + + {"x":0.5, "y":5.375, "w":1.25}, + {"x":1.75, "y":5.375, "w":1.25}, + {"x":4.75, "y":5.375, "w":1.25, "r":14, "rx":4, "ry":2.5}, + {"x":6, "y":5.375, "w":1.25, "r":14, "rx":4, "ry":2.5}, + {"x":7.25, "y":5.5, "w":2, "r":14, "rx":4, "ry":2.5}, + {"x":9.25, "y":5.5, "w":2.75, "r":-14, "rx":13.25, "ry":2.5}, + {"x":12, "y":5.375, "w":1.25, "r":-14, "rx":13.25, "ry":2.5}, + {"x":15, "y":5.375, "w":1.25}, + {"x":16.25, "y":5.375, "w":1.25}, + {"x":17.5, "y":5.375}, + {"x":18.5, "y":5.375}, + {"x":19.5, "y":5.375}, + {"x":20.75, "y":5.375}, + {"x":21.75, "y":5.375}, + {"x":22.75, "y":5.375}, + {"x":23.75, "y":5.375} ] } } diff --git a/keyboards/nopunin10did/jabberwocky/v1/v1.c b/keyboards/nopunin10did/jabberwocky/v1/v1.c deleted file mode 100644 index bea87aa889..0000000000 --- a/keyboards/nopunin10did/jabberwocky/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "v1.h" |