Move keyboard USB IDs and strings to data driven: B (qmk#17782)

nolanseaton · Jan 23, 2023 · d3ddada · d3ddada
1 parent ba63e6f
commit d3ddada
Show file tree

Hide file tree

Showing 105 changed files with 492 additions and 547 deletions.
diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/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      0x5F10
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    cyril279
-#define PRODUCT         rev41lp
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 6

diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rev41lp",
+    "manufacturer": "cyril279",
     "url": "https://github.com/cyril279/keyboards/tree/main/revlp/41_1350",
     "maintainer": "cyril279",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x5F10",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_rev41lp": {
             "layout": [

diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/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       0xBACA
-#define PRODUCT_ID      0x6970
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Viktus Design LLC
-#define PRODUCT         Bacca70
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8

diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Bacca70",
+    "manufacturer": "Viktus Design LLC",
     "url": "https://3dkeebs.com/",
     "maintainer": "keebnewb",
+    "usb": {
+        "vid": "0xBACA",
+        "pid": "0x6970",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_default": {
           "layout": [

diff --git a/keyboards/baguette/config.h b/keyboards/baguette/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      0x5050
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar
-#define PRODUCT         Baguette
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json
@@ -1,8 +1,14 @@
 {
   "keyboard_name": "Baguette",
+  "manufacturer": "Yiancar",
   "url": "",
   "maintainer": "qmk",
   "bootloader": "atmel-dfu",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x5050",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [

diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0xF4B5
-#define DEVICE_VER   0x0001
-#define MANUFACTURER 3araht
-#define PRODUCT      bandominedoni
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 7

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

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

diff --git a/keyboards/bantam44/info.json b/keyboards/bantam44/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Bantam-44",
+  "keyboard_name": "Bantam44",
+  "manufacturer": "Bantam Keyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "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":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3, "w":1.25}, {"label":"K32", "x":2.5, "y":3, "w":1.25}, {"label":"K33", "x":3.75, "y":3, "w":1.25}, {"label":"K34", "x":5, "y":3, "w":2.75}, {"label":"K35", "x":7.75, "y":3, "w":1.25}, {"label":"K36", "x":9, "y":3}, {"label":"K37", "x":10, "y":3}, {"label":"K38", "x":11, "y":3}]

diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x7033
-#define PRODUCT_ID      0x4749
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    P3D Store
-#define PRODUCT         Barleycorn SMD
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18

diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
@@ -1,6 +1,12 @@
 {
     "keyboard_name": "Barleycorn SMD",
+    "manufacturer": "P3D Store",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x7033",
+        "pid": "0x4749",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

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

diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "barracuda",
+    "manufacturer": "knaruo",
     "url": "https://github.com/knaruo/barracuda",
     "maintainer": "knaruo",
+    "usb": {
+        "vid": "0x6B6E",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_3x11": {
             "layout": [

diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xEAF3
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Swiftrax
-#define PRODUCT         Trifecta
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Trifecta", 
+    "manufacturer": "Swiftrax",
     "url": "https://www.basekeys.com", 
     "maintainer": "Swiftrax", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEAF3",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "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":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "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":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"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":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"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}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}]

diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
@@ -18,12 +18,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x6B62
-#define PRODUCT_ID      0x8989
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Clackery
-#define PRODUCT         Basketweave
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Basketweave",
+    "manufacturer": "Clackery",
     "url": "https://github.com/null-ll/basketweave",
     "maintainer": "null-ll",
+    "usb": {
+        "vid": "0x6B62",
+        "pid": "0x8989",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [

diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
@@ -1,7 +1,12 @@
 {
-    "url": "https://bastardkb.com/scylla",
+    "keyboard_name": "Scylla",
+    "manufacturer": "Bastard Keyboards",
+    "url": "https://bastardkb.com/",
+    "maintainer": "Quentin Lebastard",
     "usb": {
+        "vid": "0xA8F8",
         "pid": "0x1829",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {

diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
@@ -17,6 +17,7 @@
  */
 
 #pragma once
+#include "config_common.h"
 
 #include "config_common.h"
 

diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
@@ -1,7 +1,12 @@
 {
-    "url": "https://bastardkb.com/skeletyl",
+    "keyboard_name": "Skeletyl",
+    "manufacturer": "Bastard Keyboards",
+    "url": "https://www.bastardkb.com",
+    "maintainer": "Quentin Lebastard",
     "usb": {
+        "vid": "0xA8F8",
         "pid": "0x1830",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x5_3": {

diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1828
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT The Bastard Keyboard
 
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6

diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "The Bastard Keyboard",
+    "manufacturer": "Bastard Keyboards",
     "url": "https://bastardkb.com/",
     "maintainer": "Quentin Lebastard",
+    "usb": {
+        "vid": "0xA8F8",
+        "pid": "0x1828",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [

diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
@@ -17,6 +17,7 @@
  */
 
 #pragma once
+#include "config_common.h"
 
 #include "config_common.h"
 

diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
@@ -1,7 +1,12 @@
 {
-    "url": "https://bastardkb.com/tbk-mini",
+    "keyboard_name": "TBK Mini",
+    "manufacturer": "Bastard Keyboards",
+    "url": "https://www.bastardkb.com",
+    "maintainer": "Quentin Lebastard",
     "usb": {
+        "vid": "0xA8F8",
         "pid": "0x1828",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x6_3": {

diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6262
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER bbrfkr
-#define PRODUCT dynamis
-
 /* key matrix */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "dynamis",
+    "manufacturer": "bbrfkr",
     "url": "https://github.com/bbrfkr/keyboards",
     "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0x6262",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [

diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F6A // "oj"
-#define PRODUCT_ID 0x6276 // "bv"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER OJ
-#define PRODUCT beatervan
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

diff --git a/keyboards/beatervan/info.json b/keyboards/beatervan/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "beatervan",
+  "manufacturer": "OJ",
   "url": "",
   "maintainer": "OJ",
+  "usb": {
+    "vid": "0x6F7A",
+    "pid": "0x6276",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
         "layout": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ @@
      */
     #pragma once
+    #include "config_common.h"
     #include "config_common.h"
@@ Expand Down @@