From 1c6b0391b4685a2d6e9b8ad9fc3a88c5ad5ea31c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 30 Jul 2022 17:23:55 +1000
Subject: Move keyboard USB IDs and strings to data driven: E (#17815)

---
 keyboards/emajesty/eiri/config.h  | 7 -------
 keyboards/emajesty/eiri/info.json | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'keyboards/emajesty/eiri')

diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h
index 99b606770d..748558719f 100644
--- a/keyboards/emajesty/eiri/config.h
+++ b/keyboards/emajesty/eiri/config.h
@@ -19,13 +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   0x9372
-#define DEVICE_VER   0x0001
-#define MANUFACTURER EMajesty
-#define PRODUCT      eiri
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/info.json
index 2816dba4c7..b271741880 100644
--- a/keyboards/emajesty/eiri/info.json
+++ b/keyboards/emajesty/eiri/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "eiri",
+    "manufacturer": "EMajesty",
     "url": "https://github.com/EMajesty/eiri",
     "maintainer": "EMajesty",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x9372",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-- 
cgit v1.2.1


From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 6 Aug 2022 23:23:35 +1000
Subject: Remove `UNUSED_PINS` (#17931)

---
 keyboards/emajesty/eiri/config.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'keyboards/emajesty/eiri')

diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h
index 748558719f..fb8f2d357d 100644
--- a/keyboards/emajesty/eiri/config.h
+++ b/keyboards/emajesty/eiri/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, B5, B2, B6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-- 
cgit v1.2.1