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

4 files changed, 11 insertions, 10 deletions

diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h
index abce0cb5f8..6cf70e5c41 100644
--- a/keyboards/mlego/m60/config.h
+++ b/keyboards/mlego/m60/config.h
@@ -17,11 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xBABA
-#define MANUFACTURER alin elena
-#define PRODUCT m60
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12
 
diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json
index 12924b5ea6..fc1a46cc23 100644
--- a/keyboards/mlego/m60/info.json
+++ b/keyboards/mlego/m60/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "mlego/m60",
+    "keyboard_name": "m60",
+    "manufacturer": "alin elena",
     "url": "https://gitlab.com/m-lego/m60",
     "maintainer": "alin elena",
+    "usb": {
+        "vid": "0xBABA"
+    },
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index 638a698536..49c9492aa2 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -17,10 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x6161
-#define DEVICE_VER 0x0001
-
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
 #define LED_CAPS_LOCK_PIN C13
diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json
new file mode 100644
index 0000000000..865399a460
--- /dev/null
+++ b/keyboards/mlego/m60/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x6161",
+        "device_version": "0.0.1"
+    }
+}