Move keyboard USB IDs and strings to data driven: I (qmk#17836)

imhoffman · Aug 20, 2022 · 0e06c75 · 0e06c75
1 parent 31a9912
commit 0e06c75
Show file tree

Hide file tree

Showing 58 changed files with 188 additions and 218 deletions.
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/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    0x4B4C // "KL" = klug
-#define PRODUCT_ID   0x4742 // "GB" = grooveboard
-#define DEVICE_VER   0x0001
-#define MANUFACTURER ianklug
-#define PRODUCT      grooveboard
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 4

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

diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/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   0x6955
-#define DEVICE_VER   0x0899
-#define MANUFACTURER Ibnu D. Aji
-#define PRODUCT      Alicia Cook
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Alicia Cook",
+  "manufacturer": "Ibnu D. Aji",
   "url": "https://github.com/ibnuda/alicia-cook",
   "maintainer": "ibnuda",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6955",
+    "device_version": "8.9.9"
+  },
   "layouts": {
       "LAYOUT_all": {
           "layout": [

diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/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       0x1209
-#define PRODUCT_ID      0x6974
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ibnu D. Aji
-#define PRODUCT         Gurindam
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 8

diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "gurindam",
+    "keyboard_name": "Gurindam",
+    "manufacturer": "Ibnu D. Aji",
     "url": "https://github.com/ibnuda/gurindam",
     "maintainer": "Ibnu D. Aji",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x6974",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_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    	0x494B // "IB" for idb Keyboards
-#define PRODUCT_ID  	0x0001 // idb 60
-#define DEVICE_VER   	0x0001
-#define MANUFACTURER    idb Keyboards
-#define PRODUCT         idb 60
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "idb 60",
+    "manufacturer": "idb Keyboards",
     "url": "https://idb-keyboards.xyz/60",
     "maintainer": "itspngu",
+    "usb": {
+        "vid": "0x494B",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all",
         "LAYOUT_default": "LAYOUT_60_ansi_wkl_split_rshift"

diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0067
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID67
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ID67",
+    "manufacturer": "IDOBAO",
     "url": "https://idobao.net",
     "maintainer": "thewerther",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0067",
+        "device_version": "0.0.2"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_ansi_blocker"
     },

diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/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       0x6964 // ID
-#define PRODUCT_ID      0x0075
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID75
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "IDOBO",
+  "keyboard_name": "ID75",
+  "manufacturer": "IDOBAO",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x6964",
+    "pid": "0x0075",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_ortho_5x15": {
           "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":14, "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":14, "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":14, "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":14, "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}, {"x":14, "y":4}]

diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 // ID
-#define PRODUCT_ID      0x0075
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID75
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ID75 v2",
+    "keyboard_name": "ID75",
+    "manufacturer": "IDOBAO",
     "url": "",
     "maintainer": "peepeetee",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0075",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [

diff --git a/keyboards/idobao/id80/v3/config.h b/keyboards/idobao/id80/v3/config.h
@@ -20,14 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0080
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID80 v3
-
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 11

diff --git a/keyboards/idobao/id80/v3/info.json b/keyboards/idobao/id80/v3/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ID80 v3",
+    "manufacturer": "IDOBAO",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0080",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964   // "id"
-#define PRODUCT_ID      0x0087
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         IDOBAO ID87
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 9

diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ID87", 
+    "manufacturer": "IDOBAO",
     "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0087",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [

diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964   // "id"
-#define PRODUCT_ID      0x0087
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID87
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 9

diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ID87",
+    "manufacturer": "IDOBAO",
     "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0087",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [

diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
@@ -20,13 +20,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964  // "id"
-#define PRODUCT_ID      0x0096
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID96
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9

diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "id96",
+    "keyboard_name": "ID96",
+    "manufacturer": "IDOBAO",
     "url": "https://www.idobao.net/collections/90/products/idobao-id96-aluminum-keyboard-kit",
     "maintainer": "vinorodrigues",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0096",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Idobao
-#define PRODUCT         Montex
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 5

diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "montex numpad",
+    "keyboard_name": "Montex",
+    "manufacturer": "IDOBAO",
     "url": "https://www.idobao.net/products/ldobao-montex-pad-hot-swappable-mechanical-keyboard-kit",
     "maintainer": "NachoxMacho",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [

diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964  // "id"
-#define PRODUCT_ID      0x0127
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         Montex RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 5

diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
@@ -1,5 +1,11 @@
 {
-    "keyboard_name": "IDOBAO MONTEX RGB",
+    "keyboard_name": "Montex RGB",
+    "manufacturer": "IDOBAO",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0127",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [

diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/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       0xA103
-#define PRODUCT_ID      0x0012
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Illuminati Works
-#define PRODUCT         iS0
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "iS0", 
+    "manufacturer": "Illuminati Works",
     "url": "", 
     "maintainer": "ai03", 
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0012",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0.25, "y":0, "w":1.25, "h":2}]