Merge remote-tracking branch 'origin/master' into develop

keyboards/handwired/bento/rev1/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xDAD3
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    GhostSeven
-#define PRODUCT         Bento Macropad Rev. 1
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/handwired/bento/info.json → keyboards/handwired/bento/rev1/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Bento Macropad",
+  "keyboard_name": "Bento Macropad Rev. 1",
+  "manufacturer": "GhostSeven",
   "url": "https://www.thingiverse.com/thing:4416966",
   "maintainer": "Ghostseven",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDAD3",
+    "device_version": "1.0.0"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/handwired/co60/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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    John M Daly
-#define PRODUCT         CO60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/handwired/co60/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "CO60 rev 1",
+    "usb": {
+        "device_version": "1.0.0"
+    }
+}

keyboards/handwired/co60/rev6/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    John M Daly
-#define PRODUCT         CO60 rev6
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/handwired/co60/rev6/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "CO60 rev 6",
+    "usb": {
+        "device_version": "6.0.0"
+    }
+}

keyboards/handwired/co60/rev7/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    John M Daly
-#define PRODUCT         CO60 rev7
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/handwired/co60/rev7/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "CO60 rev 7",
+    "usb": {
+        "device_version": "7.0.0"
+    }
+}

keyboards/handwired/dactyl_manuform/3x5_3/config.h

@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID      0x3536
-#define DEVICE_VER      0x0003
-#ifdef MANUFACTURER
- #undef MANUFACTURER
-#endif
-#define MANUFACTURER    DLFord
-#define PRODUCT         Dactyl Minidox (3x5+3)
-
 // Communication
 // #define USE_I2C
 #define USE_SERIAL

keyboards/handwired/dactyl_manuform/3x5_3/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 3x5_3",
+    "keyboard_name": "Dactyl Minidox (3x5+3)",
+    "manufacturer": "DLFord",
     "url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
     "maintainer": "dlford",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [

keyboards/handwired/dactyl_manuform/4x5/config.h

@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID   0x3435
-#define DEVICE_VER   0x0001
-#define MANUFACTURER tshort
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

keyboards/handwired/dactyl_manuform/4x5/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Dactyl Manuform 4x5",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3435",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/dactyl_manuform/4x5_5/config.h

@@ -5,15 +5,6 @@
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameters */
-#define PRODUCT_ID 0x3435
-#define DEVICE_VER 0x0001
-
-#ifndef MANUFACTURER
-#define MANUFACTURER ssedrick
-#endif
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLUMNS 5
 

keyboards/handwired/dactyl_manuform/4x5_5/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Dactyl Manuform 4x5 5 thumb keys",
+    "manufacturer": "ssedrick",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
     "maintainer": "ssedrick",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3435",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/dactyl_manuform/4x6/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x3436
-#define DEVICE_VER 0x0001
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

keyboards/handwired/dactyl_manuform/4x6/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Dactyl Manuform 4x6",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3436",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/dactyl_manuform/4x6_5/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x3436
-#define DEVICE_VER 0x0001
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

keyboards/handwired/dactyl_manuform/4x6_5/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3436",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/dactyl_manuform/5x6/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3536
-#define DEVICE_VER 0x0001
-#define PRODUCT    Dactyl-Manuform (5x6)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12

keyboards/handwired/dactyl_manuform/5x6/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 5x6",
+    "keyboard_name": "Dactyl-Manuform (5x6)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_5x6": {
             "layout": [

keyboards/handwired/dactyl_manuform/5x6_2_5/config.h

@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3536
-#define DEVICE_VER 0x0003
-#define PRODUCT    Dactyl-Manuform (5x6+2)
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6

keyboards/handwired/dactyl_manuform/5x6_2_5/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 5x6 2 extra keys and 5 thumb keys",
+    "keyboard_name": "Dactyl-Manuform (5x6+2)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "jceb",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_5x6_2_5": {
             "layout": [

keyboards/handwired/dactyl_manuform/5x6_5/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3536
-#define DEVICE_VER 0x0002
-#define PRODUCT    Dactyl-Manuform (5x6)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12

keyboards/handwired/dactyl_manuform/5x6_5/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 5x6 5 thumb keys",
+    "keyboard_name": "Dactyl-Manuform (5x6)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "jceb",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_5x6_5": {
             "layout": [

keyboards/handwired/dactyl_manuform/5x7/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3537
-#define DEVICE_VER 0x0001
-#define PRODUCT    Dactyl-Manuform (5x7)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12

keyboards/handwired/dactyl_manuform/5x7/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 5x7",
+    "keyboard_name": "Dactyl-Manuform (5x7)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3537",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_5x7": {
             "layout": [

keyboards/handwired/dactyl_manuform/6x6/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID  0x3636
-#define DEVICE_VER  0x0001
-#define PRODUCT     "Dactyl-Manuform (6x6)"
-
 /* USB Device descriptor parameter */
 
 /* key matrix size */

keyboards/handwired/dactyl_manuform/6x6/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 6x6",
+    "keyboard_name": "Dactyl-Manuform (6x6)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3636",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_6x6": {
             "layout": [

keyboards/handwired/dactyl_manuform/6x6_4/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3636
-#define DEVICE_VER 0x0001
-#define PRODUCT    Dactyl-Manuform (6x6+4)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 14

keyboards/handwired/dactyl_manuform/6x6_4/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 6x6 4 extra keys",
+    "keyboard_name": "Dactyl-Manuform (6x6+4)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "dmik",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3636",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_6x6_4": {
             "layout": [

keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3636
-#define DEVICE_VER 0x0001
-#define PRODUCT    Dactyl-Manuform (6x6+4)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 14

keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 6x6 Kinesis Advantage edition",
+    "keyboard_name": "Dactyl-Manuform (6x6+4)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "dmik",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3636",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_6x6_kinesis": {
             "layout": [

keyboards/handwired/dactyl_manuform/6x7/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3636
-#define DEVICE_VER 0x0001
-#define PRODUCT    Dactyl-Manuform (6x7)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 14

keyboards/handwired/dactyl_manuform/6x7/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Dactyl Manuform 6x7",
+    "keyboard_name": "Dactyl-Manuform (6x7)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3636",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_6x7": {
             "layout": [

keyboards/handwired/dactyl_manuform/config.h

@@ -20,10 +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    0x444D
-#define MANUFACTURER tshort
-
 /* mouse config */
 #define MOUSEKEY_INTERVAL    20
 #define MOUSEKEY_DELAY       0

keyboards/handwired/dactyl_manuform/dmote/62key/config.h

@@ -2,9 +2,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3632
-#define DEVICE_VER 0x0001
-#define PRODUCT    DMOTE (62-key)
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6
 

keyboards/handwired/dactyl_manuform/dmote/62key/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "DMOTE 62-key",
+    "keyboard_name": "DMOTE (62-key)",
+    "manufacturer": "tshort",
     "url": "",
     "maintainer": "veikman",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3632",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_62key": {
             "layout": [

keyboards/handwired/dygma/raise/ansi/info.json

@@ -1,7 +1,4 @@
 {
-    "keyboard_name": "Dygma Raise",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/dygma/raise",
-    "maintainer": "ibash",
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/handwired/dygma/raise/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1209
-#define PRODUCT_ID 0x2201
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Dygma
-#define PRODUCT Raise
-
 /* key matrix size */
 // rows are doubled for split
 #define MATRIX_ROWS 10

keyboards/handwired/dygma/raise/info.json

@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "Raise",
+    "manufacturer": "Dygma",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/dygma/raise",
+    "maintainer": "ibash",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x2201",
+        "device_version": "0.0.1"
+    }
+}

keyboards/handwired/dygma/raise/iso/info.json

@@ -1,7 +1,4 @@
 {
-    "keyboard_name": "Dygma Raise",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/dygma/raise",
-    "maintainer": "ibash",
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/handwired/ms_sculpt_mobile/astar/config.h

@@ -1,6 +1,4 @@
 #pragma once
 
-#define PRODUCT sculpt mobile astar
-
 #define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D3, D2, E2 }
 #define MATRIX_COL_PINS { B4, B5, E6, B7, B6, D6, C7, F7, F6, F4, F5, F1, F0, D5, B0, B1, B2, B3 }

keyboards/handwired/ms_sculpt_mobile/astar/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "sculpt mobile astar"
+}

keyboards/handwired/ms_sculpt_mobile/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       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Microsoftplus
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18

keyboards/handwired/ms_sculpt_mobile/info.json

@@ -1,7 +1,12 @@
 {
-    "keyboard_name": "MS Sculpt Mobile",
+    "manufacturer": "Microsoftplus",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h

@@ -1,6 +1,4 @@
 #pragma once
 
-#define PRODUCT sculpt mobile teensypp
-
 #define MATRIX_ROW_PINS { F7, F6, F4, F5, F3, F2, F1, F0 }
 #define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C1, C0, C3, C2, C5, C4, C7 }

keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "sculpt mobile teensypp"
+}

keyboards/handwired/onekey/blackpill_f401/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Blackpill STM32F401
-
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
 

keyboards/handwired/onekey/blackpill_f401/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F401"
+}

keyboards/handwired/onekey/blackpill_f411/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Blackpill STM32F411
-
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
 

keyboards/handwired/onekey/blackpill_f411/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F411"
+}

keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Blackpill STM32F411 TinyUF2
-
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
 

keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2"
+}

keyboards/handwired/onekey/bluepill/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Bluepill STM32F103
-
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
 

keyboards/handwired/onekey/bluepill/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Bluepill STM32F103"
+}

keyboards/handwired/onekey/config.h

@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x6465
-#define DEVICE_VER   0x0001
-#define MANUFACTURER QMK
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

keyboards/handwired/onekey/elite_c/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Elite-C
-
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
 

keyboards/handwired/onekey/elite_c/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Elite-C"
+}

keyboards/handwired/onekey/evb_wb32f3g71/config.h

@@ -4,7 +4,5 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey WB32F3G71
-
 #define MATRIX_COL_PINS { B12 }
 #define MATRIX_ROW_PINS { B13 }

keyboards/handwired/onekey/evb_wb32f3g71/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey WB32F3G71 Eval"
+}

keyboards/handwired/onekey/evb_wb32fq95/config.h

@@ -4,7 +4,5 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey WB32FQ95
-
 #define MATRIX_COL_PINS { B12 }
 #define MATRIX_ROW_PINS { B13 }

keyboards/handwired/onekey/evb_wb32fq95/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey WB32FQ95 Eval"
+}

keyboards/handwired/onekey/info.json

@@ -1,7 +1,12 @@
 {
-    "keyboard_name": "onekey handwired",
+    "manufacturer": "QMK",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6465",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_1x1": {
             "layout": [

keyboards/handwired/onekey/nucleo_l432kc/config.h

@@ -4,8 +4,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey L432KC
-
 #define MATRIX_COL_PINS { A2 }
 #define MATRIX_ROW_PINS { A1 }
 

keyboards/handwired/onekey/nucleo_l432kc/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Nucleo L432KC"
+}

keyboards/handwired/onekey/promicro/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Pro Micro
-
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
 

keyboards/handwired/onekey/promicro/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Pro Micro"
+}

keyboards/handwired/onekey/proton_c/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Proton-C
-
 #define MATRIX_COL_PINS { A2 }
 #define MATRIX_ROW_PINS { A1 }
 

keyboards/handwired/onekey/proton_c/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Proton-C"
+}

keyboards/handwired/onekey/sipeed_longan_nano/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Sipeed Longan Nano"
+}

keyboards/handwired/onekey/stm32f0_disco/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey STM32F072 Discovery
-
 #define MATRIX_COL_PINS { B4 }
 #define MATRIX_ROW_PINS { B5 }
 

keyboards/handwired/onekey/stm32f0_disco/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey STM32F072 Discovery"
+}

keyboards/handwired/onekey/stm32f405_feather/config.h

@@ -18,7 +18,5 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Adafruit Feather STM32F405
-
 #define MATRIX_COL_PINS { C2 }
 #define MATRIX_ROW_PINS { C3 }

keyboards/handwired/onekey/stm32f405_feather/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Adafruit Feather STM32F405"
+}

keyboards/handwired/onekey/teensy_2/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Teensy 2.0
-
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
 

keyboards/handwired/onekey/teensy_2/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Teensy 2.0"
+}

keyboards/handwired/onekey/teensy_2pp/config.h

@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Teensy 2++
-
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
 

keyboards/handwired/onekey/teensy_2pp/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Teensy 2.0++"
+}

keyboards/handwired/onekey/teensy_32/config.h

@@ -19,8 +19,6 @@
 // TODO: including this causes "error: expected identifier before '(' token" errors
 //#include "config_common.h"
 
-#define PRODUCT Onekey Teensy 3.2
-
 #define MATRIX_COL_PINS { D5 }
 #define MATRIX_ROW_PINS { B2 }
 

keyboards/handwired/onekey/teensy_32/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Teensy 3.2"
+}

keyboards/handwired/onekey/teensy_lc/config.h

@@ -19,8 +19,6 @@
 // TODO: including this causes "error: expected identifier before '(' token" errors
 //#include "config_common.h"
 
-#define PRODUCT Onekey Teensy LC
-
 #define MATRIX_COL_PINS { D5 }
 #define MATRIX_ROW_PINS { B2 }
 

keyboards/handwired/onekey/teensy_lc/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Teensy LC"
+}

keyboards/handwired/postageboard/info.json

@@ -1,7 +1,12 @@
 {
     "keyboard_name": "Postage Board",
+    "manufacturer": "LifeIsOnTheWire",
     "url": "",
     "maintainer": "LifeIsOnTheWire",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xB07D"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/postageboard/mini/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 0xB07D
-#define DEVICE_VER 0x0002
-#define MANUFACTURER LifeIsOnTheWire
-#define PRODUCT PostageBoard
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3

keyboards/handwired/postageboard/mini/info.json

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

keyboards/handwired/postageboard/r1/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 0xB07D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER LifeIsOnTheWire
-#define PRODUCT PostageBoard
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3

keyboards/handwired/postageboard/r1/info.json

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

keyboards/handwired/prkl30/feather/config.h

@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xE0E0
-#define PRODUCT_ID      0x0030
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Ergorius & Tooni Skyy
-#define PRODUCT         PRKL30
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10

keyboards/handwired/prkl30/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "prkl30",
+    "keyboard_name": "PRKL30",
+    "manufacturer": "Ergorius & Tooni Skyy",
     "url": "https://github.com/ErkHal/prkl30",
     "maintainer": "ErkHal",
+    "usb": {
+        "vid": "0xE0E0",
+        "pid": "0x0030",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "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, "w":1.5}, {"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.25, "y":1, "w":1.25, "h":2}, {"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, "w":1.25}]

keyboards/handwired/prkl30/promicro/config.h

@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xE0E0
-#define PRODUCT_ID      0x0030
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Ergorius & Tooni Skyy
-#define PRODUCT         PRKL30
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10

keyboards/handwired/sono1/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    0x515A // "QZ"
-#define PRODUCT_ID   0x5331 // "S1"
-#define DEVICE_VER   0x0001
-#define MANUFACTURER ASKeyboard
-#define PRODUCT      Sono1
-
 /* key matrix size */
 #define MATRIX_ROWS 15
 #define MATRIX_COLS 8

keyboards/handwired/sono1/info.json

@@ -1,7 +1,12 @@
 {
-    "keyboard_name": "sono1", 
+    "keyboard_name": "Sono1", 
+    "manufacturer": "ASKeyboard",
     "url": "", 
     "maintainer": "DmNosachev", 
+    "usb": {
+        "vid": "0x515A",
+        "pid": "0x5331"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/sono1/stm32f103/config.h

@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#undef DEVICE_VER
-
-#define DEVICE_VER 0x0001
-
 #define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
 #define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
 

keyboards/handwired/sono1/stm32f103/info.json

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

keyboards/handwired/sono1/t2pp/config.h

@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#undef DEVICE_VER
-
-#define DEVICE_VER 0x0002
-
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 }
 

keyboards/handwired/sono1/t2pp/info.json

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

keyboards/handwired/split65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "split65",
+    "manufacturer": "percyjw",
     "url": "https://github.com/PercyJW-2/Split65",
     "maintainer": "PercyJW-2",
+    "usb": {
+        "vid": "0x4A57",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/split65/promicro/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-// USB Device descriptor parameter
-#define VENDOR_ID     0x4A57 // JW
-#define PRODUCT_ID    0x0000 // first keeb
-#define DEVICE_VER    0x0000 // first revision
-#define MANUFACTURER  percyjw
-#define PRODUCT       split65
-
 // Matrix Assignments
 #define MATRIX_ROWS 10 //Rows are doubled-up
 #define MATRIX_COLS 8

keyboards/handwired/split65/stm32/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-// USB Device descriptor parameter
-#define VENDOR_ID     0x4A57 // JW
-#define PRODUCT_ID    0x0000 // first keeb
-#define DEVICE_VER    0x0000 // first revision
-#define MANUFACTURER  percyjw
-#define PRODUCT       split65
-
 // Audio
 #define AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4