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

2022-08-20 10:55:40 +10:00
parent eceed6c50b 201f1a8f47
commit 61689ae609
550 changed files with 1689 additions and 1819 deletions
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -17,10 +17,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x6361
-#define DEVICE_VER 0x0001
-
 #define MATRIX_ROW_PINS \
    { B0, A6, A7, B1, A5 }
 #define MATRIX_COL_PINS \
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x6361",
+        "device_version": "0.0.1"
+    }
+}