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

keyboards/satt/comet46/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    SatT
-#define PRODUCT         Comet46
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 10

keyboards/satt/comet46/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Comet46",
+    "manufacturer": "SatT",
     "url": "",
     "maintainer": "SatT",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [