Move keyboard USB IDs and strings to data driven: E (qmk#17815)

imhoffman · Aug 20, 2022 · a5c3f82 · a5c3f82
1 parent ef04562
commit a5c3f82
Show file tree

Hide file tree

Showing 148 changed files with 464 additions and 534 deletions.
diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4705
-#define PRODUCT_ID      0x0187
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Pink Labs
-#define PRODUCT         e88
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

diff --git a/keyboards/e88/info.json b/keyboards/e88/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "e88",
+    "manufacturer": "Pink Labs",
     "url": "",
     "maintainer": "2-n",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0x0187",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x0192   // Ealdin Keyboards "ƒ"
-#define PRODUCT_ID      0x5154   // Quadrant "QT"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ealdin
-#define PRODUCT         Quadrant E-C
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Quadrant E-C",
+    "manufacturer": "Ealdin",
     "url": "https://github.com/Ealdin/keyboards/tree/master/Quadrant", 
     "maintainer": "Ealdin Keyboards", 
+    "usb": {
+        "vid": "0x0192",
+        "pid": "0x5154",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x14": {
                 "layout": [{"x":0, "y":0}, {"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":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "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":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]

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

diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "earth_rover",
+    "manufacturer": "k.bigwheel",
     "url": "https://github.com/bigwheel/earth_rover",
     "maintainer": "k.bigwheel",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xEE11",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

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

diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "CAPSULE65",
+    "keyboard_name": "capsule65",
+    "manufacturer": "eason",
     "url": "",
     "maintainer": "EasonQian1",
+    "usb": {
+        "vid": "0xF21E",
+        "pid": "0x6E6E",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },

diff --git a/keyboards/ebastler/e80_1800/config.h b/keyboards/ebastler/e80_1800/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6562 // "eb"
-#define PRODUCT_ID      0x1338
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    ebastler
-#define PRODUCT         E80-1800
-
 /* Limit layer count to fit in storage with VIA enabled */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 

diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "E80_1800",
+    "manufacturer": "ebastler",
     "url": "https://github.com/ebastler/E80-1800",
     "maintainer": "ebastler",
+    "usb": {
+        "vid": "0x6562",
+        "pid": "0x1338",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_1800_all": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"PgUp", "x":17.5, "y":0}, {"label":"PrtSc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"Scroll Lock", "x":18.5, "y":1}, {"label":"\u00ac", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"\"", "x":2, "y":2}, {"label":"\u00a7", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"&", "x":6, "y":2}, {"label":"/", "x":7, "y":2}, {"label":"(", "x":8, "y":2}, {"label":")", "x":9, "y":2}, {"label":"=", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"`", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2, "w":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"Pause", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"-", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"@", "x":11.75, "y":4}, {"label":"~", "x":12.75, "y":4}, {"label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"label":"+", "x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":1.25}, {"label":"|", "x":1.25, "y":5}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"up", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"AltGr", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"left", "x":13.25, "y":6.25}, {"label":"down", "x":14.25, "y":6.25}, {"label":"right", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]

diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6562 // "eb"
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    ebastler
-#define PRODUCT        isometria 75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "isometria_75",
+    "keyboard_name": "isometria 75",
+    "manufacturer": "ebastler",
     "url": "https://github.com/ebastler/isometria-75",
     "maintainer": "ebastler",
+    "usb": {
+        "vid": "0x6562",
+        "pid": "0x1337",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_iso": {
             "layout": [

diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4F4A // "OJ"
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER OJ
-#define PRODUCT edc40
-
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11
 

diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "edc40",
+    "manufacturer": "OJ",
     "url": "",
     "maintainer": "ojthetiny",
+    "usb": {
+        "vid": "0x4F4A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/edda/config.h b/keyboards/edda/config.h
@@ -15,13 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D45
-#define PRODUCT_ID      0x4544
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mekanisk
-#define PRODUCT         Edda PCB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Edda",
+    "manufacturer": "Mekanisk",
     "url": "https://mekanisk.com",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4D45",
+        "pid": "0x4544",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [

diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/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      0x0003
-#define MANUFACTURER    Fate Everywhere
-#define PRODUCT         Stand Aside
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Stand Aside",
+    "manufacturer": "Fate Everywhere",
     "url": "",
     "maintainer": "fateeverywhere",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x0412",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_ortho_4x16": {
             "layout": [

diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4A53
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0004
-#define MANUFACTURER    klackygears
-#define PRODUCT         eek!
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10

diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "eek!",
+    "manufacturer": "klackygears",
     "url": "http://www.keyboard-layout-editor.com/#/gists/3e4d0cd1534dd4e4b9f25cf2b36d0d63",
     "maintainer": "klackygears",
+    "usb": {
+        "vid": "0x4A53",
+        "pid": "0x0002",
+        "device_version": "0.0.4"
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [

diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x534F // "SO"
-#define PRODUCT_ID   0x0001
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Soran
-#define PRODUCT      Efreet
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "efreet",
+    "keyboard_name": "Efreet",
+    "manufacturer": "Soran",
     "url": "",
     "maintainer": "amberstarlight",
+    "usb": {
+        "vid": "0x534F",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_planck_mit": {
             "layout": [

diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4A53
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    klackygears
-#define PRODUCT         EIN_60
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Ein_60",
+    "manufacturer": "klackygears",
     "url": "",
     "maintainer": "klackygears",
+    "usb": {
+        "vid": "0x4A53",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/ekow/akira/config.h b/keyboards/ekow/akira/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B59 // KY
-#define PRODUCT_ID 0x414B // AK
-#define DEVICE_VER 0x0000
-#define MANUFACTURER Keeboyzlab
-#define PRODUCT AKIRA
-
 // key matrix size
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "KEYBOYZLAB:AKIRA",
+    "keyboard_name": "AKIRA",
+    "manufacturer": "Keeboyzlab",
     "maintainer": "eugenepy",
     "url": "http://github.com/EugenePY",
+    "usb": {
+        "vid": "0x4B59",
+        "pid": "0x414B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_hhkb": {
             "layout": [

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

diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "elephant42",
+    "manufacturer": "illness072",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42",
     "maintainer": "illness072",
+    "usb": {
+        "vid": "0x4649",
+        "pid": "0x0721",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [