Move keyboard USB IDs and strings to data driven: handwired (qmk#17822)

AJO-Python · Jul 30, 2022 · 2d778d2 · 2d778d2
1 parent 1c6b039
commit 2d778d2
Show file tree

Hide file tree

Showing 327 changed files with 1,044 additions and 1,192 deletions.
diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h
@@ -2,12 +2,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x1234
-#define PRODUCT_ID 0x5678
-#define DEVICE_VER 0x0001
-#define MANUFACTURER QMK
-#define PRODUCT 108Key-Trackpoint
-
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 23
 

diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "108 Key with TrackPoint",
+ "keyboard_name": "108Key-TrackPoint",
+ "manufacturer": "QMK",
  "url": "",
  "maintainer": "mkem114",
+ "usb": {
+ "vid": "0x1234",
+ "pid": "0x5678",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x2020
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Jonathan Cameron
-#define PRODUCT 2x5keypad
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 5

diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "2x5keypad",
+ "manufacturer": "Jonathan Cameron",
  "url": "",
  "maintainer": "jmcameron",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x2020",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/3dfoxc/config.h b/keyboards/handwired/3dfoxc/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER dlgoodr
-#define PRODUCT 3dfoxc
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "3dfoxc",
+ "manufacturer": "dlgoodr",
  "url": "",
  "maintainer": "dlgoodr",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x676F // "go" - gooberpsycho
-#define PRODUCT_ID 0x3660 // "3" "660"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER gooberpsycho
-#define PRODUCT 3dp660 Handwired
 
 #define TAPPING_TERM 400
 

diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "3dp660",
+ "manufacturer": "gooberpsycho",
  "url": "",
  "maintainer": "qmk",
+ "usb": {
+ "vid": "0x676F",
+ "pid": "0x3660",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_66_ansi": {
 

diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h
@@ -4,13 +4,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xF7E0
-#define PRODUCT_ID 0x0412
-#define DEVICE_VER 0x0000
-#define MANUFACTURER EDI/SCI
-#define PRODUCT 412 64 Model 00
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

diff --git a/keyboards/handwired/412_64/info.json b/keyboards/handwired/412_64/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "412-64",
+ "keyboard_name": "412-64 Model 00",
+ "manufacturer": "EDI/SCI",
  "url": "",
  "maintainer": "fateeverywhere",
+ "usb": {
+ "vid": "0xF7E0",
+ "pid": "0x0412",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_ortho_4x16": {
  "layout": [

diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0003
-#define MANUFACTURER nglgzz
-#define PRODUCT 42
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "42",
+ "manufacturer": "nglgzz",
  "url": "",
  "maintainer": "nglgzz",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.3"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xBEEF
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bratzworth
-#define PRODUCT 6key
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "6key",
+ "manufacturer": "Bratzworth",
  "url": "https://github.com/Bratzworth/6key",
  "maintainer": "bratzworth",
+ "usb": {
+ "vid": "0xBEED",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]

diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0037
-#define DEVICE_VER 0x0001
-#define MANUFACTURER joaofbmaia
-#define PRODUCT 6macro
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "6macro",
+ "manufacturer": "joaofbmaia",
  "url": "",
  "maintainer": "joaofbmaia",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0037",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]

diff --git a/keyboards/handwired/aball/config.h b/keyboards/handwired/aball/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xC2F0
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Richard Sutherland
-#define PRODUCT ABall
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "aball",
+ "keyboard_name": "ABall",
+ "manufacturer": "Richard Sutherland",
  "url": "https://github.com/brickbots/aball/",
  "maintainer": "@brickbots",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xC2F0",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6464
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 4sStylZ and others makers
-#define PRODUCT AEK64
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "aek64",
+ "keyboard_name": "AEK64",
+ "manufacturer": "4sStylZ and others makers",
  "url": "",
  "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6464",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [{"label":"Esc", "x":0, "y":0, "w":1.25}, {"label":"1", "x":1.25, "y":0}, {"label":"2", "x":2.25, "y":0}, {"label":"3", "x":3.25, "y":0}, {"label":"4", "x":4.25, "y":0}, {"label":"5", "x":5.25, "y":0}, {"label":"6", "x":6.25, "y":0}, {"label":"7", "x":7.25, "y":0}, {"label":"8", "x":8.25, "y":0}, {"label":"9", "x":9.25, "y":0}, {"label":"0", "x":10.25, "y":0}, {"label":"\u00b0", "x":11.25, "y":0}, {"label":"+", "x":12.25, "y":0}, {"label":"Backspace", "x":13.25, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"Z", "x":2.75, "y":1}, {"label":"E", "x":3.75, "y":1}, {"label":"R", "x":4.75, "y":1}, {"label":"T", "x":5.75, "y":1}, {"label":"Y", "x":6.75, "y":1}, {"label":"U", "x":7.75, "y":1}, {"label":"I", "x":8.75, "y":1}, {"label":"O", "x":9.75, "y":1}, {"label":"P", "x":10.75, "y":1}, {"label":"{", "x":11.75, "y":1}, {"label":"}", "x":12.75, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"Q", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":"M", "x":11, "y":2}, {"label":"%", "x":12, "y":2}, {"label":"&micro;", "x":13, "y":2}, {"label":"Enter", "x":14, "y":1, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":">", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"?", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"&sect;", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Opt", "x":1.5, "y":4, "w":1.25}, {"label":"Cmd", "x":2.75, "y":4, "w":1.5}, {"label":"Space", "x":4.25, "y":4, "w":6.5}, {"label":"Cmd", "x":10.75, "y":4, "w":1.5}, {"label":"Opt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]

diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0F34
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Hi-Tek
-#define PRODUCT AIM-65
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "Hi-Tek AIM-65",
+ "keyboard_name": "AIM-65",
+ "manufacturer": "Hi-Tek",
  "url": "https://github.com/Bonnee/aim-65_keyboard",
  "maintainer": "bonnee",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0F34",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1805
-#define DEVICE_VER 0x0001
-#define MANUFACTURER haesbaert
-#define PRODUCT amigopunk
-
 /* Key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "amigopunk",
+ "manufacturer": "haesbaert",
  "url": "www.haesbaert.org",
  "maintainer": "haesbaert",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1805",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [

diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
@@ -17,17 +17,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0805
-
-#define MANUFACTURER JSA
-#define PRODUCT Angel
-/* USB Version in Binary-coded decimal: 0xJJMN where
- * JJ is the major number, M is minor, N is sub minor. */
-#define DEVICE_VER 0x0100 // Version 1.00: hand-wire
-
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Angel",
+ "manufacturer": "JSA",
  "url": "https://github.com/jamessa/Angel",
  "maintainer": "jamessa",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0805",
+ "device_version": "1.0.0"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.25}, {"x":5.75, "y":3, "w":1.5}, {"x":7.25, "y":3, "w":1.25}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}]

diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xE0E0
-#define PRODUCT_ID 0x0030
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Aplyard
-#define PRODUCT Aplx2
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 2

diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Aplx2",
+ "manufacturer": "Aplyard",
  "url": "",
  "maintainer": "Aplyard",
+ "usb": {
+ "vid": "0xE0E0",
+ "pid": "0x0030",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [