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

2024-12-03 16:35:10 +00:00 · 2022-08-20 00:56:45 +00:00 · 2022-08-20 00:56:45 +00:00 · 454891e583
commit 454891e583
parent ca69c7ce3b 61689ae609
550 changed files with 1689 additions and 1819 deletions
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@ -18,19 +18,9 @@

 #include "config_common.h"

-#define VENDOR_ID    0x4A4B
-#define PRODUCT_ID   0xEF6A
-#define DEVICE_VER   0x0001
-#define MANUFACTURER JadooKB
-#define PRODUCT      JKB65 RGB
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
-
-
 #define DIODE_DIRECTION COL2ROW

 #define RGB_DI_PIN F0
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@ -1,7 +1,11 @@
 {
-    "keyboard_name": "jkb65",
+    "manufacturer": "JadooKB",
    "url": "https://jadookb.com/",
    "maintainer": "Wizard-GG",
+    "usb": {
+        "vid": "0x4A4B",
+        "pid": "0xEF6A"
+    },
    "layouts": {
        "LAYOUT_67_ansi": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":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":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":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":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"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":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"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":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
--- a/keyboards/jadookb/jkb65/r1/config.h
+++ b/keyboards/jadookb/jkb65/r1/config.h
@ -0,0 +1,20 @@
+ /* Copyright 2022 Wizad-GG
+  *
+  * 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
+
+#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
--- a/keyboards/jadookb/jkb65/r1/info.json
+++ b/keyboards/jadookb/jkb65/r1/info.json
@ -0,0 +1,6 @@
+{
+    "keyboard_name": "JKB65 RGB R1",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
--- a/keyboards/jadookb/jkb65/r1/rules.mk
+++ b/keyboards/jadookb/jkb65/r1/rules.mk
--- a/keyboards/jadookb/jkb65/r2/config.h
+++ b/keyboards/jadookb/jkb65/r2/config.h
@ -16,12 +16,5 @@
  
 #pragma once

-#undef DEVICE_VER
-#define DEVICE_VER   0x0002
-
-#undef PRODUCT
-#define PRODUCT      JKB65 RGB R2
-
-
-#undef MATRIX_COL_PINS
+#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }
--- a/keyboards/jadookb/jkb65/r2/info.json
+++ b/keyboards/jadookb/jkb65/r2/info.json
@ -0,0 +1,6 @@
+{
+    "keyboard_name": "JKB65 RGB R2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
--- a/keyboards/jadookb/jkb65/r2/rules.mk
+++ b/keyboards/jadookb/jkb65/r2/rules.mk
--- a/keyboards/jadookb/jkb65/rules.mk
+++ b/keyboards/jadookb/jkb65/rules.mk
@ -19,3 +19,5 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
+
+DEFAULT_FOLDER = jadookb/jkb65/r1
--- a/keyboards/jian/handwired/config.h
+++ b/keyboards/jian/handwired/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       0xC0DE
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0010
-#define MANUFACTURER    KgOfHedgehogs
-#define PRODUCT         Huma
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 4
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/info.json
@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Huma",
+    "usb": {
+        "device_version": "0.1.0"
+    }
+}
--- a/keyboards/jian/info.json
+++ b/keyboards/jian/info.json
@ -1,7 +1,11 @@
 {
-    "keyboard_name": "jian",
+    "manufacturer": "KgOfHedgehogs",
    "url": "t.me/s/kgofhedgehogs",
    "maintainer": "KGOH",
+    "usb": {
+        "vid": "0xC0DE",
+        "pid": "0x1337"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/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       0xC0DE
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0210
-#define MANUFACTURER    KgOfHedgehogs
-#define PRODUCT         Huma
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Huma",
+    "usb": {
+        "device_version": "2.1.0"
+    }
+}
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/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       0xC0DE
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    KgOfHedgehogs
-#define PRODUCT         Jian
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Jian",
+    "usb": {
+        "device_version": "1.0.0"
+    }
+}
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/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       0xC0DE
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    KgOfHedgehogs
-#define PRODUCT         Jian
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Jian",
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@ -2,14 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once

-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4753
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    joric
-#define PRODUCT         Jorne Keyboard
-
 /* key matrix size */
 /* Rows are doubled up */
 #define MATRIX_ROWS 8
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@ -1,7 +1,13 @@
 {
    "keyboard_name": "Jorne",
+    "manufacturer": "joric",
    "url": "https://github.com/joric/jorne/wiki",
    "maintainer": "joric",
+    "usb": {
+        "vid": "0x4753",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kakunpc/angel17/alpha/config.h
+++ b/keyboards/kakunpc/angel17/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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    kakunpc
-#define PRODUCT         angel17
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
--- a/keyboards/kakunpc/angel17/info.json
+++ b/keyboards/kakunpc/angel17/info.json
@ -1,7 +1,13 @@
 {
    "keyboard_name": "angel17",
+    "manufacturer": "kakunpc",
    "url": "https://kakunpc.booth.pm/",
    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_numpad_5x4": {
            "layout": [
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/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    kakunpc
-#define PRODUCT         angel17
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    kakunpc
-#define PRODUCT         Suihankey
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
--- a/keyboards/kakunpc/suihankey/split/info.json
+++ b/keyboards/kakunpc/suihankey/split/info.json
@ -1,7 +1,13 @@
 {
-    "keyboard_name": "suihankey_split",
+    "keyboard_name": "Suihankey",
+    "manufacturer": "kakunpc",
    "url": "https://kakunpc.booth.pm/",
    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_split_3x5_3": {
            "layout": [
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/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    kakunpc
-#define PRODUCT         Suihankey
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 4
--- a/keyboards/kapcave/paladinpad/config.h
+++ b/keyboards/kapcave/paladinpad/config.h
@ -18,12 +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       0x4B43
-#define PRODUCT_ID      0x5050
-#define MANUFACTURER    KapCave
-#define PRODUCT         paladinpad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
--- a/keyboards/kapcave/paladinpad/info.json
+++ b/keyboards/kapcave/paladinpad/info.json
@ -1,7 +1,12 @@
 {
  "keyboard_name": "PaladinPad", 
+  "manufacturer": "KapCave",
  "url": "https://kapcave.com/products/paladinpad-pcb", 
  "maintainer": "nachie", 
+  "usb": {
+    "vid": "0x4B43",
+    "pid": "0x5050"
+  },
  "layouts": {
      "LAYOUT_ortho_5x4": {
          "layout": [
--- a/keyboards/kapcave/paladinpad/rev1/info.json
+++ b/keyboards/kapcave/paladinpad/rev1/info.json
@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
--- a/keyboards/kapcave/paladinpad/rev2/info.json
+++ b/keyboards/kapcave/paladinpad/rev2/info.json
@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@ -2,14 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once

-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4C41 // "LA" Lozyuk Alexander
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    keyzog
-#define PRODUCT         Kapl Keyboard
-
 /* key matrix size */
 /* Rows are doubled up */
 #define MATRIX_ROWS 10
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@ -1,7 +1,13 @@
 {
  "keyboard_name": "Kapl",
+  "manufacturer": "keyzog",
  "url": "https://github.com/keyzog/kapl",
  "maintainer": "keyzog",
+  "usb": {
+    "vid": "0x4C41",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
  "layouts": {
      "LAYOUT": {
          "layout": [
--- a/keyboards/kbdfans/kbd67/mkiirgb/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json
@ -1,7 +1,10 @@
 {
-  "keyboard_name": "kbd67mkiirgb", 
+  "manufacturer": "KBDfans",
  "url": "", 
  "maintainer": "moyi4681", 
+  "usb": {
+    "vid": "0x4B42"
+  },
  "layouts": {
      "LAYOUT_65_ansi_blocker": {
          "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}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@ -1,10 +1,5 @@
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID       0x4B42 // KB
-#define PRODUCT_ID      0x1224
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDfans
-#define PRODUCT         kbd67mkiirgb v1

 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "kbd67mkiirgb v1",
+    "usb": {
+        "pid": "0x1224",
+        "device_version": "0.0.1"
+    }
+}
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@ -1,10 +1,5 @@
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID       0x4B42 // KB
-#define PRODUCT_ID      0x1225
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    KBDfans
-#define PRODUCT         kbd67mkiirgb v2

 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "kbd67mkiirgb v2",
+    "usb": {
+        "pid": "0x1225",
+        "device_version": "0.0.2"
+    }
+}
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@ -18,13 +18,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42 // KB
-#define PRODUCT_ID      0x1226
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    KBDfans
-#define PRODUCT         kbd67mkiirgb v3
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "kbd67mkiirgb v3",
+    "usb": {
+        "pid": "0x1226",
+        "device_version": "0.0.3"
+    }
+}
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@ -18,13 +18,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x1227
-#define DEVICE_VER      0x0004
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         KBD67 MKII RGB V4
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "kbd67mkiirgb v4",
+    "usb": {
+        "pid": "0x1227",
+        "device_version": "0.0.4"
+    }
+}
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@ -5,11 +5,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define MANUFACTURER    qmkbuilder
-#define PRODUCT         KBD75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
--- a/keyboards/kbdfans/kbd75/rev1/config.h
+++ b/keyboards/kbdfans/kbd75/rev1/config.h
@ -1,7 +0,0 @@
-// Copyright 2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@ -1,7 +1,13 @@
 {
    "keyboard_name": "KBD75 rev1",
+    "manufacturer": "KBDfans",
    "url": "",
    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
    "layout_aliases": {
        "LAYOUT_ansi_1u": "LAYOUT_75_ansi"
    },
--- a/keyboards/kbdfans/kbd75/rev2/config.h
+++ b/keyboards/kbdfans/kbd75/rev2/config.h
@ -1,7 +0,0 @@
-// Copyright 2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define PRODUCT_ID      0x6061
-#define DEVICE_VER      0x0002
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@ -1,7 +1,13 @@
 {
    "keyboard_name": "KBD75 rev2",
+    "manufacturer": "KBDfans",
    "url": "",
    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6061",
+        "device_version": "0.0.2"
+    },
    "layout_aliases": {
        "LAYOUT_ansi_1u": "LAYOUT_75_ansi"
    },
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@ -18,13 +18,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B42
-#define PRODUCT_ID      0x6063
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFANS
-#define PRODUCT         KBD75RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@ -0,0 +1,11 @@
+{
+    "keyboard_name": "KBD75RGB",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6063",
+        "device_version": "0.0.1"
+    }
+}
--- a/keyboards/kbnordic/nordic60/rev_a/config.h
+++ b/keyboards/kbnordic/nordic60/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       0x4445
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBNORDIC
-#define PRODUCT         Nordic60 Rev A
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
--- a/keyboards/kbnordic/nordic60/rev_a/info.json
+++ b/keyboards/kbnordic/nordic60/rev_a/info.json
@ -1,7 +1,13 @@
 {
    "keyboard_name": "Nordic60 Rev A",
+    "manufacturer": "KBNORDIC",
    "url": "kbnordic.se",
    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4445",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/keebio/bdn9/info.json
+++ b/keyboards/keebio/bdn9/info.json
@ -1,7 +1,10 @@
 {
-  "keyboard_name": "Keebio BDN9",
+  "manufacturer": "Keebio",
  "url": "https://keeb.io",
  "maintainer": "Keebio",
+  "usb": {
+    "vid": "0xCB10"
+  },
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/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      0x1133
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         BDN9 Rev. 1
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
--- a/keyboards/keebio/bdn9/rev1/info.json
+++ b/keyboards/keebio/bdn9/rev1/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDN9 Rev. 1",
+    "usb": {
+        "pid": "0x1133",
+        "device_version": "1.0.0"
+    }
+}
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/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      0x2133
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Keebio
-#define PRODUCT         BDN9 Rev. 2
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDN9 Rev. 2",
+    "usb": {
+        "pid": "0x2133",
+        "device_version": "2.0.0"
+    }
+}
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/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       0xCB10
-#define PRODUCT_ID      0x144C
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         DSP40 Rev. 1
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@ -1,7 +1,13 @@
 {
-    "keyboard_name": "DSP40",
+    "keyboard_name": "DSP40 Rev. 1",
+    "manufacturer": "Keebio",
    "url": "https://keeb.io",
    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x144C",
+        "device_version": "1.0.0"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/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       0xCB10
-#define PRODUCT_ID      0x1258
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         FoldKB Rev. 1
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@ -1,7 +1,13 @@
 {
-    "keyboard_name": "FoldKB",
+    "keyboard_name": "FoldKB Rev. 1",
+    "manufacturer": "Keebio",
    "url": "https://keeb.io",
    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x1258",
+        "device_version": "1.0.0"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/iris/info.json
+++ b/keyboards/keebio/iris/info.json
@ -1,7 +1,10 @@
 {
-    "keyboard_name": "Iris",
+    "manufacturer": "Keebio",
    "url": "https://keeb.io",
    "maintainer": "Keebio",
+    "usb": {
+        "vid": "0xCB10"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/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       0xCB10
-#define PRODUCT_ID      0x1256
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         Iris Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 1",
+    "usb": {
+        "pid": "0x1256",
+        "device_version": "1.0.0"
+    }
+}
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/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       0xCB10
-#define PRODUCT_ID      0x1256
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         Iris Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 1",
+    "usb": {
+        "pid": "0x1256",
+        "device_version": "1.1.0"
+    }
+}
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/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       0xCB10
-#define PRODUCT_ID      0x2256
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Keebio
-#define PRODUCT         Keebio Iris Rev. 2
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 2",
+    "usb": {
+        "pid": "0x2256",
+        "device_version": "2.0.0"
+    }
+}
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/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       0xCB10
-#define PRODUCT_ID      0x1256
-#define DEVICE_VER      0x0300
-#define MANUFACTURER    Keebio
-#define PRODUCT         Keebio Iris Rev. 3
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 3",
+    "usb": {
+        "pid": "0x3256",
+        "device_version": "3.0.0"
+    }
+}
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/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       0xCB10
-#define PRODUCT_ID      0x4256
-#define DEVICE_VER      0x0400
-#define MANUFACTURER    Keebio
-#define PRODUCT         Keebio Iris Rev. 4
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 4",
+    "usb": {
+        "pid": "0x4256",
+        "device_version": "4.0.0"
+    }
+}
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/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       0xCB10
-#define PRODUCT_ID      0x5256
-#define DEVICE_VER      0x0500
-#define MANUFACTURER    Keebio
-#define PRODUCT         Iris Rev. 5
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 5",
+    "usb": {
+        "pid": "0x5256",
+        "device_version": "5.0.0"
+    }
+}
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/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       0xCB10
-#define PRODUCT_ID      0x6256
-#define DEVICE_VER      0x0600
-#define MANUFACTURER    Keebio
-#define PRODUCT         Iris Rev. 6
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 6",
+    "usb": {
+        "pid": "0x6256",
+        "device_version": "6.0.0"
+    }
+}
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/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       0xCB10
-#define PRODUCT_ID      0x6356
-#define DEVICE_VER      0x0610
-#define MANUFACTURER    Keebio
-#define PRODUCT         Iris Rev. 6a
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 6a",
+    "usb": {
+        "pid": "0x6356",
+        "device_version": "6.1.0"
+    }
+}
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/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       0xCB10
-#define PRODUCT_ID      0x7256
-#define DEVICE_VER      0x0700
-#define MANUFACTURER    Keebio
-#define PRODUCT         Iris Rev. 7
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 7",
+    "usb": {
+        "pid": "0x7256",
+        "device_version": "7.0.0"
+    }
+}
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/rev1/config.h
@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB10
-#define PRODUCT_ID      0x126A
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         KBO-5000 Rev. 1
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@ -1,7 +1,13 @@
 {
-    "keyboard_name": "KBO-5000",
+    "keyboard_name": "KBO-5000 Rev. 1",
+    "manufacturer": "Keebio",
    "url": "https://keeb.io",
    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x126A",
+        "device_version": "1.0.0"
+    },
    "layouts": {
        "LAYOUT_ansi": {
            "layout": [
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@ -1,7 +1,11 @@
 {
  "keyboard_name": "Levinson",
+  "manufacturer": "Keebio",
  "url": "https://keeb.io",
  "maintainer": "Keebio",
+  "usb": {
+    "vid": "0xCB10"
+  },
  "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
--- a/keyboards/keebio/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB10
-#define PRODUCT_ID      0x1146
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         Levinson
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
--- a/keyboards/keebio/levinson/rev1/info.json
+++ b/keyboards/keebio/levinson/rev1/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Levinson Rev. 1",
+    "usb": {
+        "pid": "0x1146",
+        "device_version": "1.0.0"
+    }
+}
--- a/keyboards/keebio/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB10
-#define PRODUCT_ID      0x2146
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Keebio
-#define PRODUCT         Levinson
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
--- a/keyboards/keebio/levinson/rev2/info.json
+++ b/keyboards/keebio/levinson/rev2/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Levinson Rev. 2",
+    "usb": {
+        "pid": "0x2146",
+        "device_version": "2.0.0"
+    }
+}
--- a/keyboards/keebio/levinson/rev3/config.h
+++ b/keyboards/keebio/levinson/rev3/config.h
@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB10
-#define PRODUCT_ID      0x3146
-#define DEVICE_VER      0x0300
-#define MANUFACTURER    Keebio
-#define PRODUCT         Levinson
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
--- a/keyboards/keebio/levinson/rev3/info.json
+++ b/keyboards/keebio/levinson/rev3/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Levinson Rev. 3",
+    "usb": {
+        "pid": "0x3146",
+        "device_version": "3.0.0"
+    }
+}
--- a/keyboards/keebio/nyquist/info.json
+++ b/keyboards/keebio/nyquist/info.json
@ -1,6 +1,9 @@
 {
-  "keyboard_name": "Nyquist",
+  "manufacturer": "Keebio",
  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xCB10"
+  },
  "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/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       0xCB10
-#define PRODUCT_ID      0x1156
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         The Nyquist Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Nyquist Rev. 1",
+    "usb": {
+        "pid": "0x1156",
+        "device_version": "1.0.0"
+    }
+}
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/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       0xCB10
-#define PRODUCT_ID      0x2156
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Keebio
-#define PRODUCT         The Nyquist Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Nyquist Rev. 2",
+    "usb": {
+        "pid": "0x2156",
+        "device_version": "2.0.0"
+    }
+}
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/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       0xCB10
-#define PRODUCT_ID      0x3156
-#define DEVICE_VER      0x0300
-#define MANUFACTURER    Keebio
-#define PRODUCT         The Nyquist Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Nyquist Rev. 3",
+    "usb": {
+        "pid": "0x3156",
+        "device_version": "3.0.0"
+    }
+}
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/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       0xCB10
-#define PRODUCT_ID      0x1246
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         Rorschach Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Rorschach",
+  "keyboard_name": "Rorschach Rev. 1",
+  "manufacturer": "Keebio",
  "url": "https://keeb.io",
  "maintainer": "nooges",
+  "usb": {
+    "vid": "0xCB10",
+    "pid": "0x1246",
+    "device_version": "1.0.0"
+  },
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@ -1,7 +1,10 @@
 {
-    "keyboard_name": "Sinc",
+    "manufacturer": "Keebio",
    "url": "https://keeb.io",
    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10"
+    },
    "layouts": {
        "LAYOUT_75": {
            "layout": [
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB10
-#define PRODUCT_ID      0x1267
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         Sinc Rev. 1
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Sinc Rev. 1",
+    "usb": {
+        "pid": "0x1267",
+        "device_version": "1.0.0"
+    }
+}
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/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       0xCB10
-#define PRODUCT_ID      0x2267
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Keebio
-#define PRODUCT         Sinc Rev. 2
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
--- a/Show More
+++ b/Show More