diff options
Diffstat (limited to 'keyboards/nopunin10did/jabberwocky')
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/config.h | 8 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/info.json | 366 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/v1.c | 17 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v1/v1.h | 65 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v2/config.h | 8 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v2/info.json | 503 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v2/v2.c | 17 | ||||
| -rw-r--r-- | keyboards/nopunin10did/jabberwocky/v2/v2.h | 65 |
8 files changed, 520 insertions, 529 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..bf83362e16 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" @@ -15,121 +20,256 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { + "LAYOUT_lh": { + "layout": [ + {"matrix": [0, 8], "x": 0, "y": 0}, + {"matrix": [1, 8], "x": 1, "y": 0}, + {"matrix": [0, 9], "x": 2, "y": 0}, + {"matrix": [1, 9], "x": 3, "y": 0}, + {"matrix": [7, 0], "x": 4, "y": 0}, + {"matrix": [1, 1], "x": 5, "y": 0}, + {"matrix": [0, 1], "x": 6, "y": 0}, + {"matrix": [1, 2], "x": 7, "y": 0}, + {"matrix": [0, 2], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [0, 3], "x": 10, "y": 0}, + {"matrix": [0, 4], "x": 11, "y": 0}, + {"matrix": [1, 4], "x": 12, "y": 0}, + {"matrix": [0, 5], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [0, 6], "x": 15, "y": 0}, + {"matrix": [1, 6], "x": 16, "y": 0}, + {"matrix": [0, 7], "x": 17, "y": 0}, + {"matrix": [1, 7], "x": 18, "y": 0}, + {"matrix": [0, 0], "x": 19, "y": 0}, + {"matrix": [1, 0], "x": 20, "y": 0}, + {"matrix": [2, 8], "x": 21, "y": 0}, + {"matrix": [3, 8], "x": 22, "y": 0}, + {"matrix": [2, 9], "x": 23, "y": 0}, + {"matrix": [3, 9], "x": 24, "y": 0}, + {"matrix": [4, 0], "x": 25, "y": 0}, + {"matrix": [2, 1], "x": 26, "y": 0}, + {"matrix": [3, 1], "x": 27, "y": 0}, + {"matrix": [2, 2], "x": 28, "y": 0}, + {"matrix": [3, 2], "x": 29, "y": 0}, + {"matrix": [2, 3], "x": 30, "y": 0}, + {"matrix": [2, 4], "x": 31, "y": 0}, + {"matrix": [3, 4], "x": 32, "y": 0}, + {"matrix": [2, 5], "x": 33, "y": 0}, + {"matrix": [3, 5], "x": 34, "y": 0}, + {"matrix": [2, 6], "x": 35, "y": 0}, + {"matrix": [3, 6], "x": 36, "y": 0}, + {"matrix": [2, 7], "x": 37, "y": 0}, + {"matrix": [3, 7], "x": 38, "y": 0}, + {"matrix": [2, 0], "x": 39, "y": 0}, + {"matrix": [4, 8], "x": 40, "y": 0}, + {"matrix": [5, 8], "x": 41, "y": 0}, + {"matrix": [4, 9], "x": 42, "y": 0}, + {"matrix": [5, 9], "x": 43, "y": 0}, + {"matrix": [6, 0], "x": 44, "y": 0}, + {"matrix": [4, 1], "x": 45, "y": 0}, + {"matrix": [5, 1], "x": 46, "y": 0}, + {"matrix": [4, 2], "x": 47, "y": 0}, + {"matrix": [5, 2], "x": 48, "y": 0}, + {"matrix": [4, 3], "x": 49, "y": 0}, + {"matrix": [4, 4], "x": 50, "y": 0}, + {"matrix": [5, 4], "x": 51, "y": 0}, + {"matrix": [4, 5], "x": 52, "y": 0}, + {"matrix": [5, 5], "x": 53, "y": 0}, + {"matrix": [4, 6], "x": 54, "y": 0}, + {"matrix": [5, 6], "x": 55, "y": 0}, + {"matrix": [4, 7], "x": 56, "y": 0}, + {"matrix": [5, 7], "x": 57, "y": 0}, + {"matrix": [6, 8], "x": 58, "y": 0}, + {"matrix": [7, 8], "x": 59, "y": 0}, + {"matrix": [6, 9], "x": 60, "y": 0}, + {"matrix": [7, 9], "x": 61, "y": 0}, + {"matrix": [7, 1], "x": 62, "y": 0}, + {"matrix": [6, 1], "x": 63, "y": 0}, + {"matrix": [7, 2], "x": 64, "y": 0}, + {"matrix": [6, 2], "x": 65, "y": 0}, + {"matrix": [7, 3], "x": 66, "y": 0}, + {"matrix": [6, 3], "x": 67, "y": 0}, + {"matrix": [6, 4], "x": 68, "y": 0}, + {"matrix": [7, 4], "x": 69, "y": 0}, + {"matrix": [6, 5], "x": 70, "y": 0}, + {"matrix": [7, 5], "x": 71, "y": 0}, + {"matrix": [6, 6], "x": 72, "y": 0}, + {"matrix": [7, 6], "x": 73, "y": 0}, + {"matrix": [6, 7], "x": 74, "y": 0}, + {"matrix": [7, 7], "x": 75, "y": 0}, + {"matrix": [8, 8], "x": 76, "y": 0}, + {"matrix": [9, 8], "x": 77, "y": 0}, + {"matrix": [8, 9], "x": 78, "y": 0}, + {"matrix": [9, 9], "x": 79, "y": 0}, + {"matrix": [8, 0], "x": 80, "y": 0}, + {"matrix": [9, 0], "x": 81, "y": 0}, + {"matrix": [8, 1], "x": 82, "y": 0}, + {"matrix": [9, 1], "x": 83, "y": 0}, + {"matrix": [8, 2], "x": 84, "y": 0}, + {"matrix": [9, 2], "x": 85, "y": 0}, + {"matrix": [8, 3], "x": 86, "y": 0}, + {"matrix": [9, 3], "x": 87, "y": 0}, + {"matrix": [10, 4], "x": 88, "y": 0}, + {"matrix": [8, 4], "x": 89, "y": 0}, + {"matrix": [9, 4], "x": 90, "y": 0}, + {"matrix": [8, 5], "x": 91, "y": 0}, + {"matrix": [9, 5], "x": 92, "y": 0}, + {"matrix": [8, 6], "x": 93, "y": 0}, + {"matrix": [9, 6], "x": 94, "y": 0}, + {"matrix": [8, 7], "x": 95, "y": 0}, + {"matrix": [9, 7], "x": 96, "y": 0}, + {"matrix": [10, 8], "x": 97, "y": 0}, + {"matrix": [11, 8], "x": 98, "y": 0}, + {"matrix": [10, 9], "x": 99, "y": 0}, + {"matrix": [11, 9], "x": 100, "y": 0}, + {"matrix": [10, 0], "x": 101, "y": 0}, + {"matrix": [10, 1], "x": 102, "y": 0}, + {"matrix": [10, 2], "x": 103, "y": 0}, + {"matrix": [10, 3], "x": 104, "y": 0}, + {"matrix": [11, 3], "x": 105, "y": 0}, + {"matrix": [11, 4], "x": 106, "y": 0}, + {"matrix": [10, 5], "x": 107, "y": 0}, + {"matrix": [11, 5], "x": 108, "y": 0}, + {"matrix": [10, 6], "x": 109, "y": 0}, + {"matrix": [11, 6], "x": 110, "y": 0}, + {"matrix": [10, 7], "x": 111, "y": 0}, + {"matrix": [11, 7], "x": 112, "y": 0} + ] + }, "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"} + {"matrix": [7, 0], "x": 0.75, "y": 0.125}, + + {"matrix": [1, 1], "x": 2.25, "y": 0.125}, + {"matrix": [0, 1], "x": 3.25, "y": 0.125}, + {"matrix": [1, 2], "x": 4.25, "y": 0.125, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [0, 2], "x": 5.25, "y": 0, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [1, 3], "x": 6.25, "y": 0.125, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [0, 3], "x": 7.25, "y": 0.25, "r": 14, "rx": 4, "ry": 2.5}, + + {"matrix": [0, 4], "x": 10.25, "y": 0.25, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [1, 4], "x": 11.25, "y": 0.125, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [0, 5], "x": 12.25, "y": 0, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [1, 5], "x": 13.25, "y": 0.125, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [0, 6], "x": 14.25, "y": 0.125}, + {"matrix": [1, 6], "x": 15.25, "y": 0.125}, + {"matrix": [0, 7], "x": 16.375, "y": 0.125}, + {"matrix": [1, 7], "x": 17.375, "y": 0.125}, + {"matrix": [0, 0], "x": 18.5, "y": 0.125}, + {"matrix": [1, 0], "x": 19.5, "y": 0.125}, + + {"matrix": [0, 8], "x": 20.75, "y": 0.125}, + {"matrix": [1, 8], "x": 21.75, "y": 0.125}, + {"matrix": [0, 9], "x": 22.75, "y": 0.125}, + {"matrix": [1, 9], "x": 23.75, "y": 0.125}, + + {"matrix": [4, 0], "x": 2, "y": 1.375}, + {"matrix": [2, 1], "x": 3, "y": 1.375}, + {"matrix": [3, 1], "x": 4.25, "y": 1.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [2, 2], "x": 5.25, "y": 1.25, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [3, 2], "x": 6.25, "y": 1.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [2, 3], "x": 7.25, "y": 1.5, "r": 14, "rx": 4, "ry": 2.5}, + + {"matrix": [2, 4], "x": 10.25, "y": 1.5, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [3, 4], "x": 11.25, "y": 1.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [2, 5], "x": 12.25, "y": 1.25, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [3, 5], "x": 13.25, "y": 1.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [2, 6], "x": 14.5, "y": 1.375}, + {"matrix": [3, 6], "x": 15.5, "y": 1.375}, + {"matrix": [2, 7], "x": 16.5, "y": 1.375}, + {"matrix": [3, 7], "x": 17.5, "y": 1.375}, + {"matrix": [2, 0], "x": 18.5, "y": 1.375}, + + {"matrix": [2, 8], "x": 20.75, "y": 1.375}, + {"matrix": [3, 8], "x": 21.75, "y": 1.375}, + {"matrix": [2, 9], "x": 22.75, "y": 1.375}, + {"matrix": [3, 9], "x": 23.75, "y": 1.375}, + + {"matrix": [6, 0], "x": 1.25, "y": 2.375, "w": 1.5}, + {"matrix": [4, 1], "x": 2.75, "y": 2.375}, + {"matrix": [5, 1], "x": 4.25, "y": 2.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [4, 2], "x": 5.25, "y": 2.25, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [5, 2], "x": 6.25, "y": 2.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [4, 3], "x": 7.25, "y": 2.5, "r": 14, "rx": 4, "ry": 2.5}, + + {"matrix": [4, 4], "x": 10.25, "y": 2.5, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [5, 4], "x": 11.25, "y": 2.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [4, 5], "x": 12.25, "y": 2.25, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [5, 5], "x": 13.25, "y": 2.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [4, 6], "x": 14.75, "y": 2.375}, + {"matrix": [5, 6], "x": 15.75, "y": 2.375}, + {"matrix": [4, 7], "x": 16.75, "y": 2.375}, + {"matrix": [5, 7], "x": 17.75, "y": 2.375, "w": 1.5}, + + {"matrix": [4, 8], "x": 20.75, "y": 2.375}, + {"matrix": [5, 8], "x": 21.75, "y": 2.375}, + {"matrix": [4, 9], "x": 22.75, "y": 2.375}, + {"matrix": [5, 9], "x": 23.75, "y": 2.375}, + + {"matrix": [7, 1], "x": 0.75, "y": 3.375, "w": 1.75}, + {"matrix": [6, 1], "x": 2.5, "y": 3.375}, + {"matrix": [7, 2], "x": 4.25, "y": 3.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [6, 2], "x": 5.25, "y": 3.25, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [7, 3], "x": 6.25, "y": 3.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [6, 3], "x": 7.25, "y": 3.5, "r": 14, "rx": 4, "ry": 2.5}, + + {"matrix": [6, 4], "x": 10.25, "y": 3.5, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [7, 4], "x": 11.25, "y": 3.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [6, 5], "x": 12.25, "y": 3.25, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [7, 5], "x": 13.25, "y": 3.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [6, 6], "x": 15, "y": 3.375}, + {"matrix": [7, 6], "x": 16, "y": 3.375}, + {"matrix": [6, 7], "x": 17, "y": 3.375}, + {"matrix": [7, 7], "x": 18, "y": 3.375, "w": 1.25}, + + {"matrix": [6, 8], "x": 20.75, "y": 3.375}, + {"matrix": [7, 8], "x": 21.75, "y": 3.375}, + {"matrix": [6, 9], "x": 22.75, "y": 3.375}, + {"matrix": [7, 9], "x": 23.75, "y": 3.375}, + + {"matrix": [8, 0], "x": 0, "y": 4.375, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.375}, + {"matrix": [8, 1], "x": 2.25, "y": 4.375}, + {"matrix": [9, 1], "x": 4.25, "y": 4.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [8, 2], "x": 5.25, "y": 4.25, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [9, 2], "x": 6.25, "y": 4.375, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [8, 3], "x": 7.25, "y": 4.5, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [9, 3], "x": 8.25, "y": 4.5, "r": 14, "rx": 4, "ry": 2.5}, + + {"matrix": [10, 4], "x": 9.25, "y": 4.5, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [8, 4], "x": 10.25, "y": 4.5, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [9, 4], "x": 11.25, "y": 4.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [8, 5], "x": 12.25, "y": 4.25, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [9, 5], "x": 13.25, "y": 4.375, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [8, 6], "x": 15.25, "y": 4.375}, + {"matrix": [9, 6], "x": 16.25, "y": 4.375}, + {"matrix": [8, 7], "x": 17.25, "y": 4.375, "w": 1.25}, + + {"matrix": [9, 7], "x": 18.5, "y": 4.375}, + {"matrix": [8, 8], "x": 20.75, "y": 4.375}, + {"matrix": [9, 8], "x": 21.75, "y": 4.375}, + {"matrix": [8, 9], "x": 22.75, "y": 4.375}, + {"matrix": [9, 9], "x": 23.75, "y": 4.375}, + + {"matrix": [10, 0], "x": 0.5, "y": 5.375, "w": 1.25}, + {"matrix": [10, 1], "x": 1.75, "y": 5.375, "w": 1.25}, + {"matrix": [10, 2], "x": 4.75, "y": 5.375, "w": 1.25, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [10, 3], "x": 6, "y": 5.375, "w": 1.25, "r": 14, "rx": 4, "ry": 2.5}, + {"matrix": [11, 3], "x": 7.25, "y": 5.5, "w": 2, "r": 14, "rx": 4, "ry": 2.5}, + + {"matrix": [11, 4], "x": 9.25, "y": 5.5, "w": 2.75, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [10, 5], "x": 12, "y": 5.375, "w": 1.25, "r": -14, "rx": 13.25, "ry": 2.5}, + {"matrix": [11, 5], "x": 15, "y": 5.375, "w": 1.25}, + {"matrix": [10, 6], "x": 16.25, "y": 5.375, "w": 1.25}, + {"matrix": [11, 6], "x": 17.5, "y": 5.375}, + {"matrix": [10, 7], "x": 18.5, "y": 5.375}, + {"matrix": [11, 7], "x": 19.5, "y": 5.375}, + + {"matrix": [10, 8], "x": 20.75, "y": 5.375}, + {"matrix": [11, 8], "x": 21.75, "y": 5.375}, + {"matrix": [10, 9], "x": 22.75, "y": 5.375}, + {"matrix": [11, 9], "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" diff --git a/keyboards/nopunin10did/jabberwocky/v1/v1.h b/keyboards/nopunin10did/jabberwocky/v1/v1.h deleted file mode 100644 index 7abec1bf1a..0000000000 --- a/keyboards/nopunin10did/jabberwocky/v1/v1.h +++ /dev/null @@ -1,65 +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/>. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_rh( \ - K0007, K0101, K0100, K0201, K0200, K0301, K0300, K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0000, K0001, K0800, K0801, K0900, K0901, \ - K0004, K0102, K0103, K0202, K0203, K0302, K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0002, K0802, K0803, K0902, K0903, \ - K0006, K0104, K0105, K0204, K0205, K0304, K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904, K0905, \ - K0107, K0106, K0207, K0206, K0307, K0306, K0406, K0407, K0506, K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0906, K0907, \ - K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0410, K0408, K0409, K0508, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908, K0909, \ - K0010, K0110, K0210, K0310, K0311, K0411, K0510, K0511, K0610, K0611, K0710, K0711, K0810, K0811, K0910, K0911 \ -) \ -{ \ - { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \ - { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \ - { K0002, K0102, K0202, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \ - { KC_NO, K0103, K0203, KC_NO, K0403, K0503, K0603, K0703, K0803, K0903 }, \ - { K0004, K0104, K0204, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \ - { KC_NO, K0105, K0205, KC_NO, K0405, K0505, K0605, K0705, K0805, K0905 }, \ - { K0006, K0106, K0206, K0306, K0406, K0506, K0606, K0706, K0806, K0906 }, \ - { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \ - { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \ - { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, K0909 }, \ - { K0010, K0110, K0210, K0310, K0410, K0510, K0610, K0710, K0810, K0910 }, \ - { KC_NO, KC_NO, KC_NO, K0311, K0411, K0511, K0611, K0711, K0811, K0911 } \ -} - -#define LAYOUT_lh( \ - K0800, K0801, K0900, K0901, K0007, K0101, K0100, K0201, K0200, K0301, K0300, K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0000, K0001, \ - K0802, K0803, K0902, K0903, K0004, K0102, K0103, K0202, K0203, K0302, K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0002, \ - K0804, K0805, K0904, K0905, K0006, K0104, K0105, K0204, K0205, K0304, K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705, \ - K0806, K0807, K0906, K0907, K0107, K0106, K0207, K0206, K0307, K0306, K0406, K0407, K0506, K0507, K0606, K0607, K0706, K0707, \ - K0808, K0809, K0908, K0909, K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0410, K0408, K0409, K0508, K0509, K0608, K0609, K0708, K0709, \ - K0810, K0811, K0910, K0911, K0010, K0110, K0210, K0310, K0311, K0411, K0510, K0511, K0610, K0611, K0710, K0711 \ -) \ -{ \ - { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \ - { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \ - { K0002, K0102, K0202, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \ - { KC_NO, K0103, K0203, KC_NO, K0403, K0503, K0603, K0703, K0803, K0903 }, \ - { K0004, K0104, K0204, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \ - { KC_NO, K0105, K0205, KC_NO, K0405, K0505, K0605, K0705, K0805, K0905 }, \ - { K0006, K0106, K0206, K0306, K0406, K0506, K0606, K0706, K0806, K0906 }, \ - { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \ - { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \ - { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, K0909 }, \ - { K0010, K0110, K0210, K0310, K0410, K0510, K0610, K0710, K0810, K0910 }, \ - { KC_NO, KC_NO, KC_NO, K0311, K0411, K0511, K0611, K0711, K0811, K0911 } \ -} diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 0a91a41444..7be9070afe 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 } -#define MATRIX_COL_PINS { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 } - -/* 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/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index a2b9d5a02c..71d6d94542 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x4A58", "device_version": "0.2.0" }, + "matrix_pins": { + "cols": ["D0", "D2", "D3", "D5", "B5", "D7", "F6", "F7", "C7", "B6"], + "rows": ["B2", "B3", "B1", "D4", "B4", "D1", "E6", "B0", "F0", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pins": ["D6"], @@ -22,246 +27,272 @@ "layouts": { "LAYOUT_lh": { "layout": [ - {"x":0, "y":0.25, "label":"Home"}, - {"x":1, "y":0.25, "label":"End"}, - {"x":2, "y":0.25, "label":"PgUp"}, - {"x":3, "y":0.25, "label":"PgDn"}, - {"x":5, "y":0.25, "label":"Esc"}, - {"x":6.5, "y":0.25, "label":"F1"}, - {"x":7.5, "y":0.25, "label":"F2"}, - {"x":8.5, "y":0.25, "label":"F3"}, - {"x":9.5, "y":0.125, "label":"F4"}, - {"x":10.5, "y":0.25, "label":"F5"}, - {"x":11.5, "y":0.375, "label":"F6"}, - {"x":14.75, "y":0.375, "label":"F7"}, - {"x":15.75, "y":0.25, "label":"F8"}, - {"x":16.75, "y":0.125, "label":"F9"}, - {"x":17.75, "y":0.25, "label":"F10"}, - {"x":18.75, "y":0.25, "label":"F11"}, - {"x":19.75, "y":0.25, "label":"F12"}, - {"x":21, "y":0.25, "label":"Print"}, - {"x":22, "y":0.25, "label":"Scroll"}, - {"x":23, "y":0.25, "label":"Ins"}, - {"x":24, "y":0.25, "label":"Del"}, - - {"x":0, "y":1.5, "label":"NumLock"}, - {"x":1, "y":1.5, "label":"P-Div"}, - {"x":2, "y":1.5, "label":"P-Mult"}, - {"x":3, "y":1.5, "label":"P-Minus"}, - {"x":6.25, "y":1.5, "label":"Grave"}, - {"x":7.25, "y":1.5, "label":"1"}, - {"x":8.5, "y":1.5, "label":"2"}, - {"x":9.5, "y":1.375, "label":"3"}, - {"x":10.5, "y":1.5, "label":"4"}, - {"x":11.5, "y":1.625, "label":"5"}, - {"x":14.75, "y":1.625, "label":"6"}, - {"x":15.75, "y":1.5, "label":"7"}, - {"x":16.75, "y":1.375, "label":"8"}, - {"x":17.75, "y":1.5, "label":"9"}, - {"x":19, "y":1.5, "label":"0"}, - {"x":20, "y":1.5, "label":"Dash"}, - {"x":21, "y":1.5, "label":"Equals"}, - {"x":22, "y":1.5, "label":"Backspace"}, - {"x":23, "y":1.5, "label":"Backspace"}, - - {"x":0, "y":2.5, "label":"P-7"}, - {"x":1, "y":2.5, "label":"P-8"}, - {"x":2, "y":2.5, "label":"P-9"}, - {"x":3, "y":2.5, "label":"P-Plus"}, - {"x":5.5, "y":2.5, "w":1.5, "label":"Tab"}, - {"x":7, "y":2.5, "label":"Q"}, - {"x":8.5, "y":2.5, "label":"W"}, - {"x":9.5, "y":2.375, "label":"E"}, - {"x":10.5, "y":2.5, "label":"R"}, - {"x":11.5, "y":2.625, "label":"T"}, - {"x":14.75, "y":2.625, "label":"Y"}, - {"x":15.75, "y":2.5, "label":"U"}, - {"x":16.75, "y":2.375, "label":"I"}, - {"x":17.75, "y":2.5, "label":"O"}, - {"x":19.25, "y":2.5, "label":"P"}, - {"x":20.25, "y":2.5, "label":"L bracket"}, - {"x":21.25, "y":2.5, "label":"R bracket"}, - {"x":22.25, "y":2.5, "w":1.5, "label":"ANSI Backslash"}, - - {"x":0, "y":3.5, "label":"P-4"}, - {"x":1, "y":3.5, "label":"P-5"}, - {"x":2, "y":3.5, "label":"P-6"}, - {"x":3, "y":3.5, "label":"P-Plus"}, - {"x":5, "y":3.5, "w":1.75, "label":"Caps Lock"}, - {"x":6.75, "y":3.5, "label":"A"}, - {"x":8.5, "y":3.5, "label":"S"}, - {"x":9.5, "y":3.375, "label":"D"}, - {"x":10.5, "y":3.5, "label":"F"}, - {"x":11.5, "y":3.625, "label":"G"}, - {"x":14.75, "y":3.625, "label":"H"}, - {"x":15.75, "y":3.5, "label":"J"}, - {"x":16.75, "y":3.375, "label":"K"}, - {"x":17.75, "y":3.5, "label":"L"}, - {"x":19.5, "y":3.5, "label":"Semicolon"}, - {"x":20.5, "y":3.5, "label":"Quote"}, - {"x":21.5, "y":3.5, "label":"Non-US Hash"}, - {"x":22.5, "y":3.5, "w":1.25, "label":"Enter"}, - - {"x":0, "y":4.5, "label":"P-1"}, - {"x":1, "y":4.5, "label":"P-2"}, - {"x":2, "y":4.5, "label":"P-3"}, - {"x":3, "y":4.5, "label":"P-Enter"}, - {"x":4.25, "y":4.5, "w":1.25, "label":"Left Shift"}, - {"x":5.25, "y":4.5, "label":"Non-US Backslash"}, - {"x":6.25, "y":4.5, "label":"Z"}, - {"x":8.5, "y":4.5, "label":"X"}, - {"x":9.5, "y":4.375, "label":"C"}, - {"x":10.5, "y":4.5, "label":"V"}, - {"x":11.5, "y":4.625, "label":"B"}, - {"x":12.5, "y":4.625, "label":"Layer"}, - {"x":13.75, "y":4.625, "label":"Layer"}, - {"x":14.75, "y":4.625, "label":"N"}, - {"x":15.75, "y":4.5, "label":"M"}, - {"x":16.75, "y":4.375, "label":"Comma"}, - {"x":17.75, "y":4.5, "label":"Period"}, - {"x":19.75, "y":4.5, "label":"Slash"}, - {"x":20.75, "y":4.5, "label":"JIS Ro"}, - {"x":21.75, "y":4.5, "w":1.25, "label":"Right Shift"}, - {"x":23, "y":4.5, "label":"Up"}, - - {"x":0, "y":5.5, "label":"P-0"}, - {"x":1, "y":5.5, "label":"P-00"}, - {"x":2, "y":5.5, "label":"P-Decimal"}, - {"x":3, "y":5.5, "label":"P-Enter"}, - {"x":4.75, "y":5.5, "w":1.25, "label":"Left Ctrl"}, - {"x":6, "y":5.5, "w":1.25, "label":"Left GUI"}, - {"x":9, "y":5.5, "w":1.25, "label":"Left Alt"}, - {"x":10.25, "y":5.5, "w":1.25, "label":"Menu"}, - {"x":11.5, "y":5.625, "w":2, "label":"Space"}, - {"x":13.75, "y":5.625, "w":2.75, "label":"Space"}, - {"x":16.5, "y":5.5, "w":1.25, "label":"Right Alt"}, - {"x":19.5, "y":5.5, "w":1.25, "label":"Right GUI"}, - {"x":20.75, "y":5.5, "w":1.25, "label":"Right Ctrl"}, - {"x":22, "y":5.5, "label":"Left"}, - {"x":23, "y":5.5, "label":"Down"}, - {"x":24, "y":5.5, "label":"Right"} + {"matrix": [0, 0], "x": 0, "y": 0.125}, + {"matrix": [1, 0], "x": 1, "y": 0.125}, + {"matrix": [0, 1], "x": 2, "y": 0.125}, + {"matrix": [1, 1], "x": 3, "y": 0.125}, + + {"matrix": [0, 2], "x": 5, "y": 0.125}, + + {"matrix": [1, 2], "x": 6.5, "y": 0.125}, + {"matrix": [0, 3], "x": 7.5, "y": 0.125}, + {"matrix": [1, 3], "x": 8.5, "y": 0.125}, + {"matrix": [0, 4], "x": 9.5, "y": 0}, + {"matrix": [1, 4], "x": 10.5, "y": 0.125}, + {"matrix": [0, 5], "x": 11.5, "y": 0.25}, + + {"matrix": [1, 5], "x": 14.75, "y": 0.25}, + {"matrix": [0, 6], "x": 15.75, "y": 0.125}, + {"matrix": [1, 6], "x": 16.75, "y": 0}, + {"matrix": [0, 7], "x": 17.75, "y": 0.125}, + {"matrix": [1, 7], "x": 18.75, "y": 0.125}, + {"matrix": [0, 8], "x": 19.75, "y": 0.125}, + {"matrix": [1, 8], "x": 21, "y": 0.125}, + {"matrix": [0, 9], "x": 22, "y": 0.125}, + {"matrix": [1, 9], "x": 23, "y": 0.125}, + {"matrix": [5, 9], "x": 24, "y": 0.125}, + + {"matrix": [2, 0], "x": 0, "y": 1.375}, + {"matrix": [3, 0], "x": 1, "y": 1.375}, + {"matrix": [2, 1], "x": 2, "y": 1.375}, + {"matrix": [3, 1], "x": 3, "y": 1.375}, + + {"matrix": [3, 2], "x": 6.25, "y": 1.375}, + {"matrix": [2, 3], "x": 7.25, "y": 1.375}, + {"matrix": [3, 3], "x": 8.5, "y": 1.375}, + {"matrix": [2, 4], "x": 9.5, "y": 1.25}, + {"matrix": [3, 4], "x": 10.5, "y": 1.375}, + |