diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-20 00:32:18 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-20 00:32:18 +0000 |
commit | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (patch) | |
tree | 3006f82724a5352bb199296a1709036ca2fe3744 /keyboards | |
parent | f1ac92ac63b85151369e82ccdcbf4ac372933aaa (diff) | |
parent | 48792b030b754c8b3983a97071db1b09ae6353d4 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
121 files changed, 309 insertions, 293 deletions
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h index 9bb7ef666d..0eb7664878 100644 --- a/keyboards/handwired/bento/rev1/config.h +++ b/keyboards/handwired/bento/rev1/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xDAD3 -#define DEVICE_VER 0x0100 -#define MANUFACTURER GhostSeven -#define PRODUCT Bento Macropad Rev. 1 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/keyboards/handwired/bento/info.json b/keyboards/handwired/bento/rev1/info.json index cae2773de2..26aab3813a 100644 --- a/keyboards/handwired/bento/info.json +++ b/keyboards/handwired/bento/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Bento Macropad", + "keyboard_name": "Bento Macropad Rev. 1", + "manufacturer": "GhostSeven", "url": "https://www.thingiverse.com/thing:4416966", "maintainer": "Ghostseven", + "usb": { + "vid": "0xFEED", + "pid": "0xDAD3", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/co60/info.json b/keyboards/handwired/co60/info.json index 95fb155836..a6b2ae15dd 100644 --- a/keyboards/handwired/co60/info.json +++ b/keyboards/handwired/co60/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "CO60", + "manufacturer": "John M Daly", "url": "https://github.com/jmdaly/CO60", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0000" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, |