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

keyboards/keycapsss/o4l_5x12/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x7983
-#define PRODUCT_ID   0x0512
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Keycapsss
-#define PRODUCT      O4L:5x12
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12

keyboards/keycapsss/o4l_5x12/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "O4L 5x12",
+    "keyboard_name": "O4L:5x12",
+    "manufacturer": "Keycapsss",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/keycapsss/o4l_5x12",
     "maintainer": "BenRoe",
+    "usb": {
+        "vid": "0x7983",
+        "pid": "0x0512",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [