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

keyboards/ferris/0_1/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 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

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"
+    }
+}

keyboards/ferris/0_2/base/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2",
+    "usb": {
+        "pid": "0x0001"
+    }
+}

keyboards/ferris/0_2/bling/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://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

keyboards/ferris/0_2/bling/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - Bling",
+    "usb": {
+        "pid": "0x0002"
+    }
+}

keyboards/ferris/0_2/compact/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0003
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - Compact

keyboards/ferris/0_2/compact/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - Compact",
+    "usb": {
+        "pid": "0x0003"
+    }
+}

keyboards/ferris/0_2/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 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

keyboards/ferris/0_2/high/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0005
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - High

keyboards/ferris/0_2/high/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - High",
+    "usb": {
+        "pid": "0x0005"
+    }
+}

keyboards/ferris/0_2/info.json

@@ -0,0 +1,7 @@
+{
+    "manufacturer": "Cuddly Keyboards Ltd.",
+    "usb": {
+        "vid": "0xC2AB",
+        "device_version": "0.0.2"
+    }
+}

keyboards/ferris/0_2/mini/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0004
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - Mini

keyboards/ferris/0_2/mini/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - Mini",
+    "usb": {
+        "pid": "0x0004"
+    }
+}

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

keyboards/ferris/info.json

@@ -1,5 +1,4 @@
 {
-    "keyboard_name": "Ferris",
     "url": "https://github.com/pierrechevalier83/ferris/",
     "maintainer": "@pierrec83",
     "layouts": {

keyboards/ferris/sweep/config.h

@@ -21,13 +21,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    DPB
-#define PRODUCT         Ferris sweep
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

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"
+    }
+}

keyboards/flehrad/bigswitch/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      0xB195
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    flehrad
-#define PRODUCT         BigSwitch PCB
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

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}]

keyboards/flehrad/downbubble/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    Flehrad
-#define PRODUCT         downbubble
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 20

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": [

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

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": [

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

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": {

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

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": [

keyboards/fortitude60/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       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

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}]

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

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": [

keyboards/gmmk/pro/rev1/iso/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "GMMK Pro (ISO)",
+    "keyboard_name": "GMMK Pro ISO",
+    "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": [

keyboards/hadron/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       0xFB30
-#define PRODUCT_ID      0x5F37
-#define MANUFACTURER    ishtob
-#define PRODUCT         Hadron Keyboard
-
 //#define AUDIO_VOICES
 
 //#define BACKLIGHT_PIN B7

keyboards/hadron/ver2/config.h

@@ -16,9 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0002
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/hadron/ver2/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/hadron/ver3/config.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0003
-
 #undef MATRIX_ROWS
 #undef MATRIX_COLS
 /* key matrix size */

keyboards/hadron/ver3/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    }
+}

keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h

@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x16C0
-#define PRODUCT_ID 0x27DB
-#define DEVICE_VER 0x0001
-#define MANUFACTURER IBM/Purdea Andrei
-#define PRODUCT IBM Model M (4th generation)
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
 /* key matrix size */

keyboards/ibnuda/squiggle/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       0x1209
-#define PRODUCT_ID      0x6969
-#define MANUFACTURER    ibnuda
-#define PRODUCT         squiggle
-
 #define USE_SERIAL
 
 /*

keyboards/ibnuda/squiggle/rev1/config.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define DEVICE_VER      0x0001
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

keyboards/ibnuda/squiggle/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "squiggle",
+    "manufacturer": "ibnuda",
     "url": "https://github.com/ibnuda/squiggle",
     "maintainer": "Ibnu D. Aji",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x6969",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/idobao/id80/v1/ansi/config.h

@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0080
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID80

keyboards/idobao/id80/v1/ansi/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ID80 ANSI",
+    "usb": {
+        "pid": "0x0080",
+    }
+}

keyboards/idobao/id80/v1/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "ID80",
+    "manufacturer": "IDOBAO",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6964",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/idobao/id80/v1/iso/config.h

@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0081
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID80 ISO

keyboards/idobao/id80/v1/iso/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ID80 ISO",
+    "usb": {
+        "pid": "0x0081",
+    }
+}