Move keyboard USB IDs and strings to data driven: A (qmk#17781)

chillKB · Jul 26, 2022 · 674422e · 674422e
1 parent a939293
commit 674422e
Show file tree

Hide file tree

Showing 150 changed files with 475 additions and 546 deletions.
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xCB00
-#define PRODUCT_ID   0xF09F
-#define DEVICE_VER   0x0001
-#define MANUFACTURER ItsFiremanSam
-#define PRODUCT      TutelPad
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4

diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "TutelPad",
+    "manufacturer": "ItsFiremanSam",
     "url": "",
     "maintainer": "ItsFiremanSam",
+    "usb": {
+        "vid": "0xCB00",
+        "pid": "0xF09F",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID  0x0009
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MakotoKurauchi
-#define PRODUCT 1K
-
 /* matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "1k",
+  "keyboard_name": "1K",
+  "manufacturer": "MakotoKurauchi",
   "url": "",
   "maintainer": "MakotoKurauchi",
+  "usb": {
+    "vid": "0x0009",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_1x1": {
       "layout": [

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

diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Architeuthis dux",
+    "manufacturer": "tapioki",
     "url": "https://github.com/tapioki/cephalopoda",
     "maintainer": "@tapioki",
+    "usb": {
+        "vid": "0xC2AB",
+        "pid": "0x3939",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [

diff --git a/keyboards/abacus/config.h b/keyboards/abacus/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 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER nickolaij
-#define PRODUCT abacus
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

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

diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/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    0x4B47
-#define PRODUCT_ID   0x0001
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Abats Keyboard Club
-#define PRODUCT      Nayeon
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -1,11 +1,17 @@
 {
     "keyboard_name": "Nayeon",
+    "manufacturer": "Abats Keyboard Club",
     "url": "",
     "maintainer": "ramonimbao",
     "layout_aliases": {
         "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi_tsangan",
         "LAYOUT_iso": "LAYOUT_tkl_f13_iso_tsangan"
     },
+    "usb": {
+        "vid": "0x4B47",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [

diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/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    0xACE1 // Ace
-#define PRODUCT_ID   0x5449 // TI
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Acekeyboard
-#define PRODUCT      titan60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Titan60",
+    "manufacturer": "Acekeyboard",
     "url": "https://acekeyboard.co/",
     "maintainer": "keebnewb",
+    "usb": {
+        "vid": "0xACE1",
+        "pid": "0x5449",
+        "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_60_ansi": {
         "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, "w":2}, {"x":0, "y":1, "w":1.5}, {"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":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]

diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4150 // AP for AcheronProject
-#define PRODUCT_ID      0x4152 // AR for Arctic
-#define DEVICE_VER      0x0001 // Revision pre-Alpha
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         ArcticPCB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ArcticPCB", 
+    "manufacturer": "AcheronProject",
     "url": "http://gondolindrim.github.io/AcheronDocs/arctic/intro.html", 
     "maintainer": "Gondolindrim", 
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x4152",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi_tsangan": {
             "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Fn", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]

diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xAC11
-#define PRODUCT_ID      0x4175
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DriftMechanics
-#define PRODUCT         Austin
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 19

diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Austin",
+    "manufacturer": "DriftMechanics",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xAC11",
+        "pid": "0x4175",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4150 // AP for AcheronProject
-#define PRODUCT_ID      0x4B45 // KE for Keebs
-#define DEVICE_VER      0x0001 // Revision pre-Alpha
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         KeebsPCB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13

diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "KeebsPCB", 
+    "manufacturer": "AcheronProject",
     "url": "http://gondolindrim.github.io/AcheronDocs/keebs/intro.html", 
     "maintainer": "Gondolindrim", 
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x4B45",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi_tsangan": {
             "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Menu", "x":13.5, "y":4, "w":1.5}]

diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4150 // AP for AcheronProject
-#define PRODUCT_ID      0x7641 // LA for Lasgweloth
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AcheronProect
-#define PRODUCT         Lasgweloth
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Lasgweloth",
+    "manufacturer": "AcheronProject",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x7641",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [

diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xADA0
-#define PRODUCT_ID      0x1800
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ada
-#define PRODUCT         ada1800mini
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ada1800mini",
+    "manufacturer": "Ada",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xADA0",
+        "pid": "0x1800",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xADA0
-#define PRODUCT_ID   0x0081
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Ada
-#define PRODUCT      infinity81
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "infinity81",
+    "manufacturer": "Ada",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xADA0",
+        "pid": "0x0081",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/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       0xF100
-#define PRODUCT_ID      0xAD78
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    floookay
-#define PRODUCT         adelheid
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 15

diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Adelheid",
+    "manufacturer": "floookay",
     "url": "https://github.com/floookay/adelheid",
     "maintainer": "floookay",
+    "usb": {
+        "vid": "0xF100",
+        "pid": "0xAD78",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/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    0x4450 // "ADP"
-#define PRODUCT_ID   0x0001 // 'Cause it's my first keeb
-#define DEVICE_VER   0x0001
-#define MANUFACTURER adpenrose
-#define PRODUCT      Kintsugi
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Kintsugi",
+    "manufacturer": "adpenrose",
     "url": "https://github.com/ADPenrose/kintsugi_keeb",
     "maintainer": "adpenrose",
+    "usb": {
+        "vid": "0x4450",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [