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

keyboards/glenpickle/chimera_ortho/config.h

@@ -19,14 +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    unknown
-#define PRODUCT         Chimera Ortho
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 10

keyboards/glenpickle/chimera_ortho/info.json

@@ -1,6 +1,12 @@
 {
   "keyboard_name": "Chimera Ortho",
+  "manufacturer": "Unknown",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [