diff options
author | jack <[email protected]> | 2022-12-05 12:04:54 -0700 |
---|---|---|
committer | jack <[email protected]> | 2022-12-05 12:04:54 -0700 |
commit | 104ae45622bfeb79e196fc127397e3a582844714 (patch) | |
tree | a2033ed7dc7f3bc1c9ccb3cf9c6a79cd7c402790 | |
parent | acd478e817692a7cffb9486602e656f65d6065d2 (diff) | |
download | qmk_me-104ae45622bfeb79e196fc127397e3a582844714.tar.gz qmk_me-104ae45622bfeb79e196fc127397e3a582844714.zip |
add x,y coordinates to all keyboards
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | keyboards/leftover30/info.json | 76 | ||||
-rw-r--r-- | keyboards/minidox/info.json | 74 | ||||
-rw-r--r-- | keyboards/relic/info.json | 76 | ||||
-rw-r--r-- | keyboards/tornish/info.json | 83 | ||||
-rw-r--r-- | keyboards/vault35/info.json | 78 | ||||
-rw-r--r-- | keyboards/xyz60/info.json | 128 | ||||
-rw-r--r-- | waffle/config.h | 2 |
8 files changed, 263 insertions, 255 deletions
@@ -2,3 +2,4 @@ */a.out a.out .cache +util diff --git a/keyboards/leftover30/info.json b/keyboards/leftover30/info.json index 1bb80a0..1ece731 100644 --- a/keyboards/leftover30/info.json +++ b/keyboards/leftover30/info.json @@ -1,5 +1,7 @@ { "keyboard_name": "leftover30", + "manufacturer": "waffles", + "maintainer": "waffle87", "processor": "STM32F072", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", @@ -21,49 +23,49 @@ "pin": "B15" }, "usb": { - "device_version": "0.0.1", + "device_version": "1.0.0", "pid": "0x6C6F", "vid": "0x6A73" }, "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0]}, - { "matrix": [0, 1]}, - { "matrix": [0, 2]}, - { "matrix": [0, 3]}, - { "matrix": [0, 4]}, - { "matrix": [0, 5]}, - { "matrix": [0, 6]}, - { "matrix": [0, 7]}, - { "matrix": [0, 8]}, - { "matrix": [0, 9]}, - { "matrix": [0, 10]}, - { "matrix": [1, 0]}, - { "matrix": [1, 1]}, - { "matrix": [1, 2]}, - { "matrix": [1, 3]}, - { "matrix": [1, 4]}, - { "matrix": [1, 5]}, - { "matrix": [1, 6]}, - { "matrix": [1, 7]}, - { "matrix": [1, 8]}, - { "matrix": [1, 10]}, - { "matrix": [2, 0]}, - { "matrix": [2, 1]}, - { "matrix": [2, 2]}, - { "matrix": [2, 3]}, - { "matrix": [2, 4]}, - { "matrix": [2, 5]}, - { "matrix": [2, 6]}, - { "matrix": [2, 7]}, - { "matrix": [2, 8]}, - { "matrix": [2, 9]}, - { "matrix": [3, 0]}, - { "matrix": [3, 1]}, - { "matrix": [3, 5]}, - { "matrix": [3, 8]}, - { "matrix": [3, 9]} + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [1, 0], "x": 0.75, "y": 1}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 2.5, "y": 3, "w": 6.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/minidox/info.json b/keyboards/minidox/info.json index abf4c7e..4a33c16 100644 --- a/keyboards/minidox/info.json +++ b/keyboards/minidox/info.json @@ -1,5 +1,7 @@ { "keyboard_name": "minidox", + "manufacturer": "waffles", + "maintainer": "waffle87", "development_board": "promicro", "diode_direction": "COL2ROW", "matrix_pins": { @@ -24,42 +26,42 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - { "matrix": [0, 0] }, - { "matrix": [0, 1] }, - { "matrix": [0, 2] }, - { "matrix": [0, 3] }, - { "matrix": [0, 4] }, - { "matrix": [4, 4] }, - { "matrix": [4, 3] }, - { "matrix": [4, 2] }, - { "matrix": [4, 1] }, - { "matrix": [4, 0] }, - { "matrix": [1, 0] }, - { "matrix": [1, 1] }, - { "matrix": [1, 2] }, - { "matrix": [1, 3] }, - { "matrix": [1, 4] }, - { "matrix": [5, 4] }, - { "matrix": [5, 3] }, - { "matrix": [5, 2] }, - { "matrix": [5, 1] }, - { "matrix": [5, 0] }, - { "matrix": [2, 0] }, - { "matrix": [2, 1] }, - { "matrix": [2, 2] }, - { "matrix": [2, 3] }, - { "matrix": [2, 4] }, - { "matrix": [6, 4] }, - { "matrix": [6, 3] }, - { "matrix": [6, 2] }, - { "matrix": [6, 1] }, - { "matrix": [6, 0] }, - { "matrix": [3, 2] }, - { "matrix": [3, 3] }, - { "matrix": [3, 4] }, - { "matrix": [7, 4] }, - { "matrix": [7, 3] }, - { "matrix": [7, 2] } + { "matrix": [0, 0], "x":0, "y":0.25 }, + { "matrix": [0, 1], "x":1, "y":0.125 }, + { "matrix": [0, 2], "x":2, "y":0 }, + { "matrix": [0, 3], "x":3, "y":0.125 }, + { "matrix": [0, 4], "x":4, "y":0.25 }, + { "matrix": [4, 4], "x":7, "y":0.25 }, + { "matrix": [4, 3], "x":8, "y":0.125 }, + { "matrix": [4, 2], "x":9, "y":0 }, + { "matrix": [4, 1], "x":10, "y":0.125 }, + { "matrix": [4, 0], "x":11, "y":0.25 }, + { "matrix": [1, 0], "x":0, "y":1.25 }, + { "matrix": [1, 1], "x":1, "y":1.125 }, + { "matrix": [1, 2], "x":2, "y":1 }, + { "matrix": [1, 3], "x":3, "y":1.125 }, + { "matrix": [1, 4], "x":4, "y":1.25 }, + { "matrix": [5, 4], "x":7, "y":1.25 }, + { "matrix": [5, 3], "x":8, "y":1.125 }, + { "matrix": [5, 2], "x":9, "y":1 }, + { "matrix": [5, 1], "x":10, "y":1.125 }, + { "matrix": [5, 0], "x":11, "y":1.25 }, + { "matrix": [2, 0], "x":0, "y":2.25 }, + { "matrix": [2, 1], "x":1, "y":2.125 }, + { "matrix": [2, 2], "x":2, "y":2 }, + { "matrix": [2, 3], "x":3, "y":2.125 }, + { "matrix": [2, 4], "x":4, "y":2.25 }, + { "matrix": [6, 4], "x":7, "y":2.25 }, + { "matrix": [6, 3], "x":8, "y":2.125 }, + { "matrix": [6, 2], "x":9, "y":2 }, + { "matrix": [6, 1], "x":10, "y":2.125 }, + { "matrix": [6, 0], "x":11, "y":2.25 }, + { "matrix": [3, 2], "x":2.5, "y":3.25 }, + { "matrix": [3, 3], "x":3.5, "y":3.5 }, + { "matrix": [3, 4], "x":4.5, "y":3.75 }, + { "matrix": [7, 4], "x":6.5, "y":3.75 }, + { "matrix": [7, 3], "x":7.5, "y":3.5 }, + { "matrix": [7, 2], "x":8.5, "y":3.25 } ] } } diff --git a/keyboards/relic/info.json b/keyboards/relic/info.json index 079b797..461c88a 100644 --- a/keyboards/relic/info.json +++ b/keyboards/relic/info.json @@ -1,5 +1,7 @@ { "keyboard_name": "relic", + "manufacturer": "waffles", + "maintainer": "waffle87", "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", @@ -15,43 +17,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "q", "matrix": [0, 0]}, - {"label": "w", "matrix": [0, 1]}, - {"label": "e", "matrix": [0, 2]}, - {"label": "r", "matrix": [0, 3]}, - {"label": "t", "matrix": [0, 4]}, - {"label": "y", "matrix": [0, 5]}, - {"label": "u", "matrix": [0, 6]}, - {"label": "i", "matrix": [0, 7]}, - {"label": "o", "matrix": [0, 8]}, - {"label": "p", "matrix": [0, 9]}, - {"label": "play", "matrix": [0, 10]}, - {"label": "a", "matrix": [1, 0]}, - {"label": "s", "matrix": [1, 1]}, - {"label": "d", "matrix": [1, 2]}, - {"label": "f", "matrix": [1, 3]}, - {"label": "g", "matrix": [1, 4]}, - {"label": "h", "matrix": [1, 5]}, - {"label": "j", "matrix": [1, 6]}, - {"label": "k", "matrix": [1, 7]}, - {"label": "l", "matrix": [1, 8]}, - {"label": ";", "matrix": [1, 9]}, - {"label": "z", "matrix": [2, 0]}, - {"label": "x", "matrix": [2, 1]}, - {"label": "c", "matrix": [2, 2]}, - {"label": "v", "matrix": [2, 3]}, - {"label": "b", "matrix": [2, 4]}, - {"label": "n", "matrix": [2, 5]}, - {"label": "m", "matrix": [2, 6]}, - {"label": ",", "matrix": [2, 7]}, - {"label": ".", "matrix": [2, 8]}, - {"label": "/", "matrix": [2, 9]}, - {"label": "vol-", "matrix": [3, 0]}, - {"label": "gui", "matrix": [3, 1]}, - {"label": "spc", "matrix": [3, 4]}, - {"label": "bspc", "matrix": [3, 6]}, - {"label": "pste", "matrix": [3, 8]}, - {"label": "vol+", "matrix": [3, 9]} + {"label": "q", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "w", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "e", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "r", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "t", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "y", "matrix": [0, 5], "x": 6, "y": 0}, + {"label": "u", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "i", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "o", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "p", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "a", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "s", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "d", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "f", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "g", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "h", "matrix": [1, 5], "x": 6.25, "y": 1}, + {"label": "j", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "k", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "l", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": ";", "matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75}, + {"label": "z", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "x", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "c", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "v", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "b", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "n", "matrix": [2, 5], "x": 6.75, "y": 2}, + {"label": "m", "matrix": [2, 6], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 7], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 8], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25}, + {"label": "", "matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25}, + {"label": "esc", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25}, + {"label": "spc", "matrix": [3, 4], "x": 2.75, "y": 3, "w": 3}, + {"label": "bspc", "matrix": [3, 6], "x": 5.75, "y": 3, "w": 3}, + {"label": "", "matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25}, + {"label": "", "matrix": [3, 9], "x": 10, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/tornish/info.json b/keyboards/tornish/info.json index 182e48e..b8c8e61 100644 --- a/keyboards/tornish/info.json +++ b/keyboards/tornish/info.json @@ -1,44 +1,45 @@ { - "manufacturer": "waffles", - "keyboard_name": "tornish", - "bootloader": "usbasploader", - "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["B3", "B4", "B5", "B0", "D7", "D6"], - "rows": ["D4", "D1", "D0", "D5"] - }, - "processor": "atmega328p", - "usb": { - "device_version": "1.0.0", - "pid": "0x6A73", - "vid": "0x6D64" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0]}, - {"matrix": [0, 1]}, - {"matrix": [0, 2]}, - {"matrix": [0, 3]}, - {"matrix": [0, 4]}, - {"matrix": [0, 5]}, - {"matrix": [1, 0]}, - {"matrix": [1, 1]}, - {"matrix": [1, 2]}, - {"matrix": [1, 3]}, - {"matrix": [1, 4]}, - {"matrix": [1, 5]}, - {"matrix": [2, 0]}, - {"matrix": [2, 1]}, - {"matrix": [2, 2]}, - {"matrix": [2, 3]}, - {"matrix": [2, 4]}, - {"matrix": [2, 5]}, - {"matrix": [3, 2]}, - {"matrix": [3, 3]}, - {"matrix": [3, 4]}, - {"matrix": [3, 5]} - ] - } + "keyboard_name": "tornish", + "manufacturer": "waffles", + "maintainer": "waffle87", + "bootloader": "usbasploader", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["B3", "B4", "B5", "B0", "D7", "D6"], + "rows": ["D4", "D1", "D0", "D5"] + }, + "processor": "atmega328p", + "usb": { + "device_version": "1.0.0", + "pid": "0x6A73", + "vid": "0x6D64" + }, + "layouts": { + "LAYOUT": { + "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, 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} + ] } + } } diff --git a/keyboards/vault35/info.json b/keyboards/vault35/info.json index a375b33..b018fb1 100644 --- a/keyboards/vault35/info.json +++ b/keyboards/vault35/info.json @@ -1,5 +1,7 @@ { - "keyboard_name": "Vault35", + "keyboard_name": "vault35", + "manufacturer": "waffles", + "maintainer": "waffle87", "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", @@ -26,43 +28,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "q", "matrix": [0, 0]}, - {"label": "w", "matrix": [0, 1]}, - {"label": "e", "matrix": [0, 2]}, - {"label": "r", "matrix": [0, 3]}, - {"label": "t", "matrix": [0, 4]}, - {"label": "y", "matrix": [0, 5]}, - {"label": "u", "matrix": [0, 6]}, - {"label": "i", "matrix": [0, 7]}, - {"label": "o", "matrix": [0, 8]}, - {"label": "p", "matrix": [0, 9]}, - {"label": "null", "matrix": [0, 10]}, - {"label": "a", "matrix": [1, 0]}, - {"label": "s", "matrix": [1, 1]}, - {"label": "d", "matrix": [1, 2]}, - {"label": "f", "matrix": [1, 3]}, - {"label": "g", "matrix": [1, 4]}, - {"label": "h", "matrix": [1, 5]}, - {"label": "j", "matrix": [1, 6]}, - {"label": "k", "matrix": [1, 7]}, - {"label": "l", "matrix": [1, 8]}, - {"label": ";", "matrix": [1, 9]}, - {"label": "z", "matrix": [2, 0]}, - {"label": "x", "matrix": [2, 1]}, - {"label": "c", "matrix": [2, 2]}, - {"label": "v", "matrix": [2, 3]}, - {"label": "b", "matrix": [2, 4]}, - {"label": "n", "matrix": [2, 5]}, - {"label": "m", "matrix": [2, 6]}, - {"label": ",", "matrix": [2, 7]}, - {"label": ".", "matrix": [2, 8]}, - {"label": "/", "matrix": [2, 9]}, - {"label": "../", "matrix": [3, 1]}, - {"label": "lwr", "matrix": [3, 2]}, - {"label": "spc", "matrix": [3, 3]}, - {"label": "bspc", "matrix": [3, 5]}, - {"label": "rse", "matrix": [3, 6]}, - {"label": "pnp", "matrix": [3, 7]} + {"label": "q", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "w", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "e", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "r", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "t", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "y", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "u", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "i", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "o", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "p", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "a", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "s", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "d", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "f", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "g", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "h", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "j", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "k", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "l", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": ";", "matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75}, + {"label": "z", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "x", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "c", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "v", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "b", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "n", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "m", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": ",", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ".", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "/", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25}, + {"label": "../", "matrix": [3, 1], "x": 1.5, "y": 3}, + {"label": "", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"label": "spc", "matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75}, + {"label": "bspc", "matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75}, + {"label": "", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25}, + {"label": "", "matrix": [3, 7], "x": 8.5, "y": 3} ] } } diff --git a/keyboards/xyz60/info.json b/keyboards/xyz60/info.json index 37e7edd..6d0ebdd 100644 --- a/keyboards/xyz60/info.json +++ b/keyboards/xyz60/info.json @@ -1,16 +1,14 @@ { "keyboard_name": "xyz60", + "manufacturer": "waffles", + "maintainer": "waffle87", + "processor": "STM32F103", "bootloader": "stm32duino", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B13", "B8", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], "rows": ["B7", "B9", "B12", "B14", "B15"] }, - "matrix_size": { - "cols": 15, - "rows": 5 - }, - "processor": "STM32F103", "usb": { "device_version": "0.0.1", "pid": "0x7879", @@ -19,66 +17,66 @@ "layouts": { "LAYOUT_60_ansi_tsangan": { "layout": [ - {"matrix": [0, 0]}, - {"matrix": [0, 1]}, - {"matrix": [0, 2]}, - {"matrix": [0, 3]}, - {"matrix": [0, 4]}, - {"matrix": [0, 5]}, - {"matrix": [0, 6]}, - {"matrix": [0, 7]}, - {"matrix": [0, 8]}, - {"matrix": [0, 9]}, - {"matrix": [0, 10]}, - {"matrix": [0, 11]}, - {"matrix": [0, 12]}, - {"matrix": [0, 14]}, - {"matrix": [1, 0]}, - {"matrix": [1, 1]}, - {"matrix": [1, 2]}, - {"matrix": [1, 3]}, - {"matrix": [1, 4]}, - {"matrix": [1, 5]}, - {"matrix": [1, 6]}, - {"matrix": [1, 7]}, - {"matrix": [1, 8]}, - {"matrix": [1, 9]}, - {"matrix": [1, 10]}, - {"matrix": [1, 11]}, - {"matrix": [1, 12]}, - {"matrix": [1, 13]}, - {"matrix": [2, 0]}, - {"matrix": [2, 1]}, - {"matrix": [2, 2]}, - {"matrix": [2, 3]}, - {"matrix": [2, 4]}, - {"matrix": [2, 5]}, - {"matrix": [2, 6]}, - {"matrix": [2, 7]}, - {"matrix": [2, 8]}, - {"matrix": [2, 9]}, - {"matrix": [2, 10]}, - {"matrix": [2, 11]}, - {"matrix": [2, 13]}, - {"matrix": [3, 0]}, - {"matrix": [3, 2]}, - {"matrix": [3, 3]}, - {"matrix": [3, 4]}, - {"matrix": [3, 5]}, - {"matrix": [3, 6]}, - {"matrix": [3, 7]}, - {"matrix": [3, 8]}, - {"matrix": [3, 9]}, - {"matrix": [3, 10]}, - {"matrix": [3, 11]}, - {"matrix": [3, 13]}, - {"matrix": [4, 0]}, - {"matrix": [4, 1]}, - {"matrix": [4, 2]}, - {"matrix": [4, 6]}, - {"matrix": [4, 10]}, - {"matrix": [4, 12]}, - {"matrix": [4, 13]} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 0, "y": 0}, + {"matrix": [0, 4], "x": 0, "y": 0}, + {"matrix": [0, 5], "x": 0, "y": 0}, + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 7], "x": 0, "y": 0}, + {"matrix": [0, 8], "x": 0, "y": 0}, + {"matrix": [0, 9], "x": 0, "y": 0}, + {"matrix": [0, 10], "x": 0, "y": 0}, + {"matrix": [0, 11], "x": 0, "y": 0}, + {"matrix": [0, 12], "x": 0, "y": 0}, + {"matrix": [0, 14], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 0, "y": 0}, + {"matrix": [1, 2], "x": 0, "y": 0}, + {"matrix": [1, 3], "x": 0, "y": 0}, + {"matrix": [1, 4], "x": 0, "y": 0}, + {"matrix": [1, 5], "x": 0, "y": 0}, + {"matrix": [1, 6], "x": 0, "y": 0}, + {"matrix": [1, 7], "x": 0, "y": 0}, + {"matrix": [1, 8], "x": 0, "y": 0}, + {"matrix": [1, 9], "x": 0, "y": 0}, + {"matrix": [1, 10], "x": 0, "y": 0}, + {"matrix": [1, 11], "x": 0, "y": 0}, + {"matrix": [1, 12], "x": 0, "y": 0}, + {"matrix": [1, 13], "x": 0, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 0}, + {"matrix": [2, 1], "x": 0, "y": 0}, + {"matrix": [2, 2], "x": 0, "y": 0}, + {"matrix": [2, 3], "x": 0, "y": 0}, + {"matrix": [2, 4], "x": 0, "y": 0}, + {"matrix": [2, 5], "x": 0, "y": 0}, + {"matrix": [2, 6], "x": 0, "y": 0}, + {"matrix": [2, 7], "x": 0, "y": 0}, + {"matrix": [2, 8], "x": 0, "y": 0}, + {"matrix": [2, 9], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 0, "y": 0}, + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 13], "x": 0, "y": 0}, + {"matrix": [3, 0], "x": 0, "y": 0}, + {"matrix": [3, 2], "x": 0, "y": 0}, + {"matrix": [3, 3], "x": 0, "y": 0}, + {"matrix": [3, 4], "x": 0, "y": 0}, + {"matrix": [3, 5], "x": 0, "y": 0}, + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 0, "y": 0}, + {"matrix": [3, 8], "x": 0, "y": 0}, + {"matrix": [3, 9], "x": 0, "y": 0}, + {"matrix": [3, 10], "x": 0, "y": 0}, + {"matrix": [3, 11], "x": 0, "y": 0}, + {"matrix": [3, 13], "x": 0, "y": 0}, + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 0, "y": 0}, + {"matrix": [4, 2], "x": 0, "y": 0}, + {"matrix": [4, 6], "x": 0, "y": 0}, + {"matrix": [4, 10], "x": 0, "y": 0}, + {"matrix": [4, 12], "x": 0, "y": 0}, + {"matrix": [4, 13], "x": 0, "y": 0} ] } } diff --git a/waffle/config.h b/waffle/config.h index edf92d6..649c0ab 100644 --- a/waffle/config.h +++ b/waffle/config.h @@ -21,7 +21,7 @@ #define PRODUCT_ID 0x6B62 #endif #undef MANUFACTURER -#define MANUFACTURER "Waffles" +#define MANUFACTURER "waffles" #ifdef OLED_ENABLE # define OLED_FONT_H "users/waffle/oledfont.h" |