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

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

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