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

keyboards/0_sixty/base/info.json

@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "0-Sixty",
+    "usb": {
+        "pid": "0x0060"
+    },
+    "indicators": {
+        "caps_lock": "B6"
+    }
+}

keyboards/0_sixty/config.h

@@ -18,15 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-
-#define VENDOR_ID       0x7654
-#define PRODUCT_ID      0x0060
-#define DEVICE_VER      0x0001
-
-#define MANUFACTURER    ven0mtr0n
-#define PRODUCT         0-Sixty
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 5
@@ -40,9 +31,6 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-/* indicator leds */
-#define LED_CAPS_LOCK_PIN B6
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/0_sixty/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "0-Sixty",
+    "manufacturer": "ven0mtr0n",
     "url": "",
     "maintainer": "vinamarora8",
+    "usb": {
+        "vid": "0x7654",
+        "device_version": "0.0.1"
+    },
     "layouts": {
 	"LAYOUT_1x2uC": {
             "layout": [

keyboards/0_sixty/rules.mk

@@ -17,3 +17,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 LTO_ENABLE = yes            # Link-time opt
+
+DEFAULT_FOLDER = 0_sixty/base

keyboards/0_sixty/underglow/config.h

@@ -18,15 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#undef PRODUCT_ID
-#define PRODUCT_ID      0x0061
-#undef PRODUCT
-#define PRODUCT         0-Sixty-underglow
-
-/* no caps lock with underglow */
-#undef LED_CAPS_LOCK_PIN
-
 /* underglow */
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 24

keyboards/0_sixty/underglow/info.json

@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "0-Sixty-underglow",
+    "usb": {
+        "pid": "0x0061"
+    },
+    "features": {
+        "rgblight": true
+    }
+}

keyboards/0_sixty/underglow/rules.mk

@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow

keyboards/0_sixty/underglow/underglow.h

@@ -1,19 +0,0 @@
-/* Copyright 2021 Vinam Arora <vinam@posteo.de>
- *
- * 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 "0_sixty.h"

keyboards/1upkeyboards/sweet16/config.h

@@ -2,11 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6F75 // OU
-#define MANUFACTURER    1up Keyboards
-#define PRODUCT         Sweet16
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

keyboards/1upkeyboards/sweet16/info.json

@@ -1,7 +1,11 @@
 {
   "keyboard_name": "Sweet16",
+  "manufacturer": "1up Keyboards",
   "url": "",
   "maintainer": "skullydazed",
+  "usb": {
+    "vid": "0x6F75"
+  },
   "layouts": {
       "LAYOUT_ortho_4x4": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]

keyboards/1upkeyboards/sweet16/v1/config.h

@@ -2,10 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0161
-#define DEVICE_VER      0x0001
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6 }

keyboards/1upkeyboards/sweet16/v1/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0161",
+        "device_version": "0.0.1"
+    }
+}

keyboards/1upkeyboards/sweet16/v2/promicro/config.h

@@ -2,10 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0162
-#define DEVICE_VER      0x0001
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, D1, E6, B5 }
 #define MATRIX_COL_PINS { F7, F6, D2, D3 }

keyboards/1upkeyboards/sweet16/v2/promicro/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0162",
+        "device_version": "0.0.1"
+    }
+}

keyboards/1upkeyboards/sweet16/v2/proton_c/config.h

@@ -2,10 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0162
-#define DEVICE_VER      0x0001
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B7, B2, B0 }
 #define MATRIX_COL_PINS { B8, A0, A10, A9 }

keyboards/1upkeyboards/sweet16/v2/proton_c/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0162",
+        "device_version": "0.0.1"
+    }
+}

keyboards/25keys/aleth42/info.json

@@ -1,7 +1,12 @@
 {
-    "keyboard_name": "aleth42", 
+    "keyboard_name": "ALETH42", 
+    "manufacturer": "25KEYS",
     "url": "http://www.sho-k.co.uk/tech/aleth42", 
     "maintainer": "monksoffunk", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEAC8"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/25keys/aleth42/rev0/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 0x04D8
-#define PRODUCT_ID 0xEAC8
-#define DEVICE_VER 0x0000
-#define MANUFACTURER 25KEYS
-#define PRODUCT ALETH42
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11

keyboards/25keys/aleth42/rev0/info.json

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

keyboards/25keys/aleth42/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 0x04D8
-#define PRODUCT_ID 0xEAC8
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 25KEYS
-#define PRODUCT ALETH42
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11

keyboards/25keys/aleth42/rev1/info.json

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

keyboards/25keys/zinc/info.json

@@ -1,7 +1,12 @@
 {
-  "keyboard_name": "Zinc",
+  "manufacturer": "25KEYS",
-  "url": "https://github.com/monksoffunk/",
+  "url": "https://github.com/monksoffunk/zinc",
   "maintainer": "monksoffunk",
+   "usb": {
+    "vid": "0x04D8",
+    "pid": "0xEA3B",
+    "device_version": "0.0.1"
+   },
    "layouts": {
     "LAYOUT": {
       "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"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":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]

keyboards/25keys/zinc/rev1/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       0x04D8
-#define PRODUCT_ID      0xEA3B
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    25KEYS
-#define PRODUCT         zinc rev.1
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 

keyboards/25keys/zinc/rev1/info.json

@@ -1,10 +1,3 @@
 {
-  "keyboard_name": "Zinc rev.1",
+  "keyboard_name": "Zinc rev.1"
-  "url": "https://github.com/monksoffunk/zinc",
-  "maintainer": "monksoffunk",
-  "layouts": {
-    "LAYOUT": {
-      "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"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":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
-    }
-  }
 }

keyboards/25keys/zinc/reva/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       0x04D8
-#define PRODUCT_ID      0xEA3B
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    25KEYS
-#define PRODUCT         zinc rev.A
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 

keyboards/25keys/zinc/reva/info.json

@@ -1,10 +1,3 @@
 {
-  "keyboard_name": "Zinc rev.A",
+  "keyboard_name": "Zinc rev.A"
-  "url": "https://github.com/monksoffunk/zinc",
-  "maintainer": "monksoffunk",
-  "layouts": {
-    "LAYOUT": {
-      "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"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":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"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":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
-    }
-  }
 }

keyboards/3w6/info.json

@@ -1,7 +1,12 @@
 {
     "keyboard_name": "3w6",
+    "manufacturer": "weteor",
     "url": "https://github.com/weteor/3W6/",
     "maintainer": "weteor",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4658"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/3w6/rev1/config.h

@@ -17,14 +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   0x4658
-#define DEVICE_VER   0x0001
-#define MANUFACTURER weteor
-#define PRODUCT      3w6
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10

keyboards/3w6/rev1/info.json

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

keyboards/3w6/rev2/config.h

@@ -17,14 +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   0x4658
-#define DEVICE_VER   0x0002
-#define MANUFACTURER weteor
-#define PRODUCT      3w6
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10

keyboards/3w6/rev2/info.json

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

keyboards/4pplet/aekiso60/rev_a/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4444
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         AEKISO60 Rev A
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/4pplet/aekiso60/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "AEKISO60 Rev A",
+    "manufacturer": "4pplet",
     "url": "",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/4pplet/bootleg/rev_a/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       0x4444
-#define PRODUCT_ID      0x0004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         bootleg Rev A
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/4pplet/bootleg/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "bootleg Rev A",
+    "manufacturer": "4pplet",
     "url": "https://github.com/4pplet/bootlegs",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/4pplet/eagle_viper_rep/rev_a/config.h

@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4444
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         Eagle Viper REP Rev A
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
 

keyboards/4pplet/eagle_viper_rep/rev_a/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Eagle/Viper Rep",
+    "keyboard_name": "Eagle Viper REP Rev A",
+    "manufacturer": "4pplet",
     "url": "https://github.com/4pplet/eagle_viper_rep",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/4pplet/perk60_iso/rev_a/config.h

@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4444
-#define PRODUCT_ID      0x0009
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         Perk60 ISO Rev A
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
 

keyboards/4pplet/perk60_iso/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Perk60 ISO Rev A",
+    "manufacturer": "4pplet",
     "url": "",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0009",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_iso": {
             "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "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":"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":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"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.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]

keyboards/4pplet/steezy60/rev_a/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4444
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         Steezy60 Rev A
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/4pplet/steezy60/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Steezy60 Rev A",
+    "manufacturer": "4pplet",
     "url": "",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/4pplet/waffling60/info.json

@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "Waffling60 Rev A",
+    "manufacturer": "4pplet",
     "url": "https://github.com/4pplet/waffling60",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/4pplet/waffling60/rev_a/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4444
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         waffling60 Rev A
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 11

keyboards/4pplet/waffling60/rev_a/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Waffling60 Rev A",
+    "usb": {
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    }
+}

keyboards/4pplet/waffling60/rev_b/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       0x4444
-#define PRODUCT_ID      0x0005
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    4pplet
-#define PRODUCT         waffling60 Rev B
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/4pplet/waffling60/rev_b/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Waffling60 Rev B",
+    "usb": {
+        "pid": "0x0005",
+        "device_version": "0.0.2"
+    }
+}

keyboards/4pplet/waffling60/rev_c/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       0x4444
-#define PRODUCT_ID      0x0008
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    4pplet
-#define PRODUCT         waffling60 Rev C
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/4pplet/waffling60/rev_c/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Waffling60 Rev C",
+    "usb": {
+        "pid": "0x0008",
+        "device_version": "0.0.3"
+    }
+}

keyboards/4pplet/waffling80/rev_a/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       0x4444
-#define PRODUCT_ID      0x0006
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    4pplet
-#define PRODUCT         waffling80 Rev A
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8

keyboards/4pplet/waffling80/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "waffling80 Rev A",
+    "manufacturer": "4pplet",
     "url": "",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]

keyboards/4pplet/yakiimo/rev_a/config.h

@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4444
-#define PRODUCT_ID      0x000A
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    4pplet
-#define PRODUCT         Yakiimo Rev A
-
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9
 

keyboards/4pplet/yakiimo/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Yakiimo Rev A",
+    "manufacturer": "4pplet",
     "url": "https://github.com/4pplet/yakiimo-PCB",
     "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000A",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"Esc", "x":2.75, "y":0}, {"label":"F1", "x":4.75, "y":0}, {"label":"F2", "x":5.75, "y":0}, {"label":"F3", "x":6.75, "y":0}, {"label":"F4", "x":7.75, "y":0}, {"label":"F5", "x":9.25, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":2.75, "y":1.5}, {"label":"!", "x":3.75, "y":1.5}, {"label":"@", "x":4.75, "y":1.5}, {"label":"#", "x":5.75, "y":1.5}, {"label":"$", "x":6.75, "y":1.5}, {"label":"%", "x":7.75, "y":1.5}, {"label":"^", "x":8.75, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"|", "x":15.75, "y":1.5}, {"label":"~", "x":16.75, "y":1.5}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":2.75, "y":2.5, "w":1.5}, {"label":"Q", "x":4.25, "y":2.5}, {"label":"W", "x":5.25, "y":2.5}, {"label":"E", "x":6.25, "y":2.5}, {"label":"R", "x":7.25, "y":2.5}, {"label":"T", "x":8.25, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":2.75, "y":3.5, "w":1.75}, {"label":"A", "x":4.5, "y":3.5}, {"label":"S", "x":5.5, "y":3.5}, {"label":"D", "x":6.5, "y":3.5}, {"label":"F", "x":7.5, "y":3.5}, {"label":"G", "x":8.5, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"~", "x":15.5, "y":3.5}, {"label":"Enter", "x":16.5, "y":3.5, "w":1.25}, {"label":"Shift", "x":2.75, "y":4.5, "w":1.25}, {"label":"|", "x":4, "y":4.5}, {"label":"Z", "x":5, "y":4.5}, {"label":"X", "x":6, "y":4.5}, {"label":"C", "x":7, "y":4.5}, {"label":"V", "x":8, "y":4.5}, {"label":"B", "x":9, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":1.75}, {"label":"Fn", "x":16.75, "y":4.5}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":2.75, "y":5.5, "w":1.5}, {"label":"Win", "x":4.25, "y":5.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"x":9.75, "y":5.5}, {"x":10.75, "y":5.5, "w":3}, {"label":"AltGr", "x":13.75, "y":5.5, "w":1.5}, {"label":"Win", "x":15.25, "y":5.5}, {"label":"Ctrl", "x":16.25, "y":5.5, "w":1.5}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}]

keyboards/8pack/config.h

@@ -2,12 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x2171
-#define MANUFACTURER    Charles Garcia
-#define PRODUCT         8-Pack
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 

keyboards/8pack/info.json

@@ -1,7 +1,12 @@
 {
   "keyboard_name": "8-Pack",
+  "manufacturer": "Charles Garcia",
   "url": "https://github.com/cgarcia2097/8-Pack",
   "maintainer": "Charles Garcia",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x2171"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/8pack/rev11/config.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#define DEVICE_VER      0x0001

keyboards/8pack/rev11/info.json

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

keyboards/8pack/rev12/config.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#define DEVICE_VER      0x0002

keyboards/8pack/rev12/info.json

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

keyboards/abstract/ellipse/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      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AbstractKB
-#define PRODUCT         EllipseRev1
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/abstract/ellipse/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Ellipse", 
+    "manufacturer": "AbstractKB",
     "url": "https://abstractkb.tk/product/ellipse-rev1", 
     "maintainer": "AbstractKB", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]

keyboards/acheron/apollo/87h/delta/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      0x8775 // For 87H + 3 (revision Delta)
-#define DEVICE_VER      0x0004 // Revision Delta
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         Apollo87H
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/acheron/apollo/87h/delta/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Apollo87H",
+    "usb": {
+        "pid": "0x8775",
+        "device_version": "0.0.4"
+    }
+}

keyboards/acheron/apollo/87h/gamma/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      0x8774 // For 87H + 2 (revision Gamma)
-#define DEVICE_VER      0x0003 // Revision Gamma
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         Apollo87H rev. Gamma
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/acheron/apollo/87h/gamma/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Apollo87H rev. Gamma",
+    "usb": {
+        "pid": "0x8774",
+        "device_version": "0.0.3"
+    }
+}

keyboards/acheron/apollo/87h/info.json

@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "AcheronProject Apollo87H",
+    "manufacturer": "AcheronProject",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [

keyboards/acheron/apollo/87htsc/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      0x8776 // For 87H + 4 
-#define DEVICE_VER      0x0001 // Revision Alpha
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         Apollo87H-T-SC
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/acheron/apollo/87htsc/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "AcheronProject Apollo87H-T-SC",
+    "keyboard_name": "Apollo87H-T-SC",
+    "manufacturer": "AcheronProject",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x8776",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [

keyboards/acheron/apollo/88htsc/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      0x8873 // For 87H 
-#define DEVICE_VER      0x0001 // Revision Alpha
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         Apollo88H-T-SC
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/acheron/apollo/88htsc/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "AcheronProject Apollo88H-T-SC",
+    "keyboard_name": "Apollo88H-T-SC",
+    "manufacturer": "AcheronProject",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x8873",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [

keyboards/acheron/athena/alpha/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 0xAC11
-#define PRODUCT_ID 0x6584 // AT fot Athena
-#define DEVICE_VER 0x0001 
-#define MANUFACTURER AcheronProject
-#define PRODUCT Athena
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
 

keyboards/acheron/athena/alpha/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Athena",
+    "usb": {
+        "pid": "0x6584",
+        "device_version": "0.0.1"
+    }
+}

keyboards/acheron/athena/beta/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 0xAC11
-#define PRODUCT_ID 0x6585 // AT+1 for Athena rev.  Beta
-#define DEVICE_VER 0x0002 // Rev. Beta
-#define MANUFACTURER AcheronProject
-#define PRODUCT Athena rev Beta
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
 

keyboards/acheron/athena/beta/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Athena rev Beta",
+    "usb": {
+        "pid": "0x6585",
+        "device_version": "0.0.2"
+    }
+}

keyboards/acheron/athena/info.json

@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "AcheronProject Athena",
+    "manufacturer": "AcheronProject",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0xAC11"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/acheron/elongate/beta/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 0x4150 //AP for AcheronProject
-#define PRODUCT_ID 0x454C // EL for Elongate
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Acheron Project
-#define PRODUCT Elongate
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13

keyboards/acheron/elongate/beta/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Elongate",
+    "manufacturer": "Acheron Project",
     "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x454C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/acheron/elongate/delta/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 0x4150 //AP for AcheronProject
-#define PRODUCT_ID 0x454D // EL+1 for Elongate revision Delta
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Acheron Project
-#define PRODUCT Elongate
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 

keyboards/acheron/elongate/delta/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Elongate",
+    "manufacturer": "Acheron Project",
     "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x454D",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/acheron/shark/alpha/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       0xAC11
-#define PRODUCT_ID      0x5368
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         SharkPCB
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/acheron/shark/alpha/info.json

@@ -2,6 +2,10 @@
   "keyboard_name": "SharkPCB",
   "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html",
   "maintainer": "Gondolindrim",
+  "usb": {
+    "pid": "0x5368",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [

keyboards/acheron/shark/beta/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 0xAC11
-#define PRODUCT_ID 0x5369 // For Shark+1
-#define DEVICE_VER 0x0002
-#define MANUFACTURER AcheronProject
-#define PRODUCT SharkPCB rev. Beta
-
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
 

keyboards/acheron/shark/beta/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "SharkPCB rev. Beta",
+    "usb": {
+        "pid": "0x5369",
+        "device_version": "0.0.2"
+    }
+}

keyboards/acheron/shark/info.json

@@ -0,0 +1,6 @@
+{
+    "manufacturer": "AcheronProject",
+    "usb": {
+        "vid": "0xAC11"
+    }
+}

keyboards/adkb96/info.json

@@ -1,7 +1,13 @@
 {
-	"keyboard_name": "adkb96",
+	"keyboard_name": "ADKB96",
+	"manufacturer": "Bit Trade One",
 	"url": "",
 	"maintainer": "qmk",
+	"usb": {
+		"vid": "0x00A5",
+		"pid": "0xAD96",
+		"device_version": "0.0.1"
+	},
 	"layouts": {
 		"LAYOUT_ortho_6x16": {
 			"layout": [

keyboards/adkb96/rev1/config.h

@@ -16,13 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00a5
-#define PRODUCT_ID      0xad96
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Bit Trade One
-#define PRODUCT         ADKB96
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12

keyboards/adm42/config.h

@@ -18,14 +18,6 @@
 
 #include "config_common.h"
 
-/* Microchip ADM42 sublicensing */
-#define VENDOR_ID				0x04D8
-#define PRODUCT_ID			0xE873
-
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Lorenzo Leonini
-#define PRODUCT         ADM42
-
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
 

keyboards/adm42/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ADM42 rev4",
+    "keyboard_name": "ADM42",
+    "manufacturer": "Lorenzo Leonini",
     "url": "https://adm42.dev/",
     "maintainer": "lleonini",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE873",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_adm42_3x12_6": {
             "layout": [

keyboards/aeboards/constellation/rev1/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4145 // AE
-#define PRODUCT_ID      0x065C // 65 - Constellation
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AEBoards
-#define PRODUCT         AEBoards Constellation Rev1
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/aeboards/constellation/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Constellation",
+    "keyboard_name": "Constellation Rev1",
+    "manufacturer": "AEBoards",
     "url": "",
     "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x065C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/aeboards/constellation/rev2/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4145 // AE
-#define PRODUCT_ID      0x065C // 65 - Constellation
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AEBoards
-#define PRODUCT         AEBoards Constellation Rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/aeboards/constellation/rev2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Constellation",
+    "keyboard_name": "Constellation Rev2",
+    "manufacturer": "AEBoards",
     "url": "",
     "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x065C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/aeboards/ext65/info.json

@@ -1,7 +1,12 @@
 {
     "keyboard_name": "Ext65",
+    "manufacturer": "AEBoards",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4145",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ext65": {
             "layout": [

keyboards/aeboards/ext65/rev1/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4145 // "AE"
-#define PRODUCT_ID      0xAE65 // AEboards EXT65
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AEBoards
-#define PRODUCT         AEBoards Ext65
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 10

keyboards/aeboards/ext65/rev1/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0xAE65"
+    }
+}

keyboards/aeboards/ext65/rev2/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       0x4145 // "AE"
-#define PRODUCT_ID      0xA652 // AEboards EXT65 Rev2
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    AEBoards
-#define PRODUCT         AEBoards Ext65 Rev2
-
 /* key matrix size */
 /* key matrix size */
 #define MATRIX_ROWS 10

keyboards/aeboards/ext65/rev2/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0xA652"
+    }
+}

keyboards/afternoonlabs/breeze/rev0/config.h

@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x616C
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0000
-#define MANUFACTURER AfternoonLabs
-#define PRODUCT Breeze
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

keyboards/afternoonlabs/breeze/rev0/info.json

@@ -1,8 +1,13 @@
 {
     "keyboard_name": "Breeze",
+    "manufacturer": "AfternoonLabs",
     "url": "afternoonlabs.com/breeze",
-    "productId": "0x0001",
     "maintainer": "eithanshavit",
+    "usb": {
+        "vid": "0x616C",
+        "pid": "0x0001",
+        "device_version": "0.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/afternoonlabs/breeze/rev1/config.h

@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x616C
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER AfternoonLabs
-#define PRODUCT Breeze
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10