Move keyboard USB IDs and strings to data driven, pass 2: F-I (qmk#17958

)
nolanseaton · Jan 23, 2023 · 4a9c933 · 4a9c933
1 parent f780880
commit 4a9c933
Show file tree

Hide file tree

Showing 49 changed files with 155 additions and 234 deletions.
diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC2AB
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Pierre
-#define PRODUCT Ferris the keeb
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10

diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
@@ -0,0 +1,9 @@
+{
+ "keyboard_name": "Ferris the keeb",
+ "manufacturer": "Pierre",
+ "usb": {
+ "vid": "0xC2AB",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/ferris/0_2/base/info.json b/keyboards/ferris/0_2/base/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Ferris 0.2",
+ "usb": {
+ "pid": "0x0001"
+ }
+}
diff --git a/keyboards/ferris/0_2/base/rules.mk b/keyboards/ferris/0_2/base/rules.mk
diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0002
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - Bling
-
-
-
 /* LED Drivers */
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110101

diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Ferris 0.2 - Bling",
+ "usb": {
+ "pid": "0x0002"
+ }
+}
diff --git a/keyboards/ferris/0_2/compact/config.h b/keyboards/ferris/0_2/compact/config.h
diff --git a/keyboards/ferris/0_2/compact/info.json b/keyboards/ferris/0_2/compact/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Ferris 0.2 - Compact",
+ "usb": {
+ "pid": "0x0003"
+ }
+}
diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC2AB
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Cuddly Keyboards Ltd.
-#define PRODUCT Ferris 0.2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10

diff --git a/keyboards/ferris/0_2/high/config.h b/keyboards/ferris/0_2/high/config.h
diff --git a/keyboards/ferris/0_2/high/info.json b/keyboards/ferris/0_2/high/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Ferris 0.2 - High",
+ "usb": {
+ "pid": "0x0005"
+ }
+}
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
@@ -0,0 +1,7 @@
+{
+ "manufacturer": "Cuddly Keyboards Ltd.",
+ "usb": {
+ "vid": "0xC2AB",
+ "device_version": "0.0.2"
+ }
+}
diff --git a/keyboards/ferris/0_2/mini/config.h b/keyboards/ferris/0_2/mini/config.h
diff --git a/keyboards/ferris/0_2/mini/info.json b/keyboards/ferris/0_2/mini/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Ferris 0.2 - Mini",
+ "usb": {
+ "pid": "0x0004"
+ }
+}
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
@@ -25,3 +25,5 @@ SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
 
 LAYOUTS = split_3x5_2
+
+DEFAULT_FOLDER = ferris/0_2/base
diff --git a/keyboards/ferris/info.json b/keyboards/ferris/info.json
@@ -1,5 +1,4 @@
 {
- "keyboard_name": "Ferris",
  "url": "https://github.com/pierrechevalier83/ferris/",
  "maintainer": "@pierrec83",
  "layouts": {

diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
@@ -21,13 +21,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 0xC2AB
-#define PRODUCT_ID 0x3939
-#define DEVICE_VER 0x0001
-#define MANUFACTURER DPB
-#define PRODUCT Ferris sweep
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json
@@ -0,0 +1,9 @@
+{
+ "keyboard_name": "Ferris sweep",
+ "manufacturer": "DPB",
+ "usb": {
+ "vid": "0xC2AB",
+ "pid": "0x3939",
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/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 0x1209
-#define PRODUCT_ID 0xB195
-#define DEVICE_VER 0x0001
-#define MANUFACTURER flehrad
-#define PRODUCT BigSwitch PCB
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
@@ -1,6 +1,12 @@
 {
- "keyboard_name": "Bigswitch PCB",
+ "keyboard_name": "BigSwitch PCB",
+ "manufacturer": "flehrad",
  "maintainer": "qmk",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0xB195",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [{"x":0, "y":0, "w":4, "h":4}]

diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/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 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Flehrad
-#define PRODUCT downbubble
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 20

diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json
@@ -1,6 +1,12 @@
 {
  "keyboard_name": "downbubble",
+ "manufacturer": "Flehrad",
  "maintainer": "flehrad",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_standard": {
  "layout": [

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

diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Numbrero",
+ "manufacturer": "Flehrad",
  "url": "",
  "maintainer": "Flehrad",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_numbrero_numpad": {
  "layout": [

diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4443 // "DC" = Don Chiou
-#define PRODUCT_ID 0x5350 // "SP" = Snagpad
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Flehrad
-#define PRODUCT Snagpad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Snagpad",
+ "manufacturer": "Flehrad",
  "url": "",
  "maintainer": "Flehrad",
+ "usb": {
+ "vid": "0x4443",
+ "pid": "0x5350",
+ "device_version": "0.0.1"
+ },
  "layouts": {
 
  "LAYOUT_ortho_5x4": {

diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Flehrad
-#define PRODUCT Trade Station
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "Tradestation",
+ "keyboard_name": "Trade Station",
+ "manufacturer": "Flehrad",
  "url": "",
  "maintainer": "Flehrad",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT_tradestation": {
  "layout": [

diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/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 0xCB10
-#define PRODUCT_ID 0x1156
-#define DEVICE_VER 0x0100
-#define MANUFACTURER Pekaso
-#define PRODUCT Fortitude60
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

diff --git a/keyboards/fortitude60/info.json → keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/info.json → keyboards/fortitude60/rev1/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Fortitude60",
+ "manufacturer": "Pekaso",
  "url": "",
  "maintainer": "qmk",
+ "usb": {
+ "vid": "0xCB10",
+ "pid": "0x1156",
+ "device_version": "1.0.0"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"R00", "x":9, "y":0}, {"label":"R01", "x":10, "y":0}, {"label":"R02", "x":11, "y":0}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0}, {"label":"R05", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"R10", "x":9, "y":1}, {"label":"R11", "x":10, "y":1}, {"label":"R12", "x":11, "y":1}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1}, {"label":"R15", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"R20", "x":9, "y":2}, {"label":"R21", "x":10, "y":2}, {"label":"R22", "x":11, "y":2}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2}, {"label":"R25", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"LT5", "x":6, "y":3}, {"label":"RT5", "x":8, "y":3}, {"label":"R30", "x":9, "y":3}, {"label":"R31", "x":10, "y":3}, {"label":"R32", "x":11, "y":3}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3}, {"label":"R35", "x":14, "y":3}, {"label":"LT0", "x":2, "y":4}, {"label":"LT1", "x":3, "y":4}, {"label":"LT2", "x":4, "y":4}, {"label":"LT3", "x":5, "y":4}, {"label":"LT4", "x":6, "y":4}, {"label":"RT4", "x":8, "y":4}, {"label":"RT3", "x":9, "y":4}, {"label":"RT2", "x":10, "y":4}, {"label":"RT1", "x":11, "y":4}, {"label":"RT0", "x":12, "y":4}]

diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0001
-#define VENDOR_ID 0x320F
-#define PRODUCT_ID 0x5044
-#define MANUFACTURER Glorious
-#define PRODUCT GMMK Pro
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 8

diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -1,7 +1,13 @@
 {
- "keyboard_name": "GMMK Pro (ANSI)",
+ "keyboard_name": "GMMK Pro ANSI",
+ "manufacturer": "Glorious",
  "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
  "maintainer": "GloriousThrall",
+ "usb": {
+ "vid": "0x320F",
+ "pid": "0x5044",
+ "device_version": "0.0.1"
+ },
  "layouts": {
  "LAYOUT": {
  "layout": [