From f4dcce7e5975276ef41d882a15e6a459b6b3689d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 20 Aug 2022 10:45:28 +1000
Subject: Move keyboard USB IDs and strings to data driven, pass 2: M-O
 (#18090)

---
 keyboards/mlego/m65/config.h       | 4 ----
 keyboards/mlego/m65/info.json      | 6 +++++-
 keyboards/mlego/m65/rev1/config.h  | 3 ---
 keyboards/mlego/m65/rev1/info.json | 6 ++++++
 keyboards/mlego/m65/rev2/config.h  | 3 ---
 keyboards/mlego/m65/rev2/info.json | 6 ++++++
 keyboards/mlego/m65/rev3/config.h  | 3 ---
 keyboards/mlego/m65/rev3/info.json | 6 ++++++
 keyboards/mlego/m65/rev4/config.h  | 3 ---
 keyboards/mlego/m65/rev4/info.json | 6 ++++++
 10 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 keyboards/mlego/m65/rev1/info.json
 create mode 100644 keyboards/mlego/m65/rev2/info.json
 create mode 100644 keyboards/mlego/m65/rev3/info.json
 create mode 100644 keyboards/mlego/m65/rev4/info.json

(limited to 'keyboards/mlego/m65')

diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h
index 25d69d8b7a..7ac1f7271c 100644
--- a/keyboards/mlego/m65/config.h
+++ b/keyboards/mlego/m65/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0xBABA
-#define MANUFACTURER Alin Elena
-#define PRODUCT m65
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13
 
diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json
index 175c6638c5..3c7d816d62 100644
--- a/keyboards/mlego/m65/info.json
+++ b/keyboards/mlego/m65/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "M65",
+    "keyboard_name": "m65",
+    "manufacturer": "Alin Elena",
     "url": "https://gitlab.com/m-lego/m65",
     "maintainer": "alin elena",
+    "usb": {
+        "vid": "0xBABA"
+    },
     "layouts": {
         "LAYOUT_ortho_5x13": {
             "layout": [
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index 0e40ae2e3d..2d55ed86a0 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER 0x0001
-#define PRODUCT_ID 0x6061
-
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
 #define LED_CAPS_LOCK_PIN C13
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
new file mode 100644
index 0000000000..e495c94992
--- /dev/null
+++ b/keyboards/mlego/m65/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x6061",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index db13bbb2ad..11335a5d69 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER 0x0002
-#define PRODUCT_ID 0x6061
-
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
 #define LED_CAPS_LOCK_PIN B2
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
new file mode 100644
index 0000000000..470262ed85
--- /dev/null
+++ b/keyboards/mlego/m65/rev2/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x6061",
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index a4b1ba3343..84a0c8a19f 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER 0x0001
-#define PRODUCT_ID 0x6062
-
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
 #define LED_CAPS_LOCK_PIN C13
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
new file mode 100644
index 0000000000..e42ab50857
--- /dev/null
+++ b/keyboards/mlego/m65/rev3/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x6062",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index 07dd0fefaa..b3187fbdb7 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER 0x0002
-#define PRODUCT_ID 0x6062
-
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
 #define LED_CAPS_LOCK_PIN C13
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
new file mode 100644
index 0000000000..c94ea38e22
--- /dev/null
+++ b/keyboards/mlego/m65/rev4/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x6062",
+        "device_version": "0.0.2"
+    }
+}
-- 
cgit v1.2.3