From 30796913913c0f6dc0cce317ad8249de2b602294 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 14 Aug 2022 10:47:05 +1000
Subject: Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A
 (#17941)

---
 keyboards/acheron/apollo/87h/delta/config.h  | 7 -------
 keyboards/acheron/apollo/87h/delta/info.json | 7 +++++++
 keyboards/acheron/apollo/87h/gamma/config.h  | 7 -------
 keyboards/acheron/apollo/87h/gamma/info.json | 7 +++++++
 keyboards/acheron/apollo/87h/info.json       | 5 ++++-
 5 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 keyboards/acheron/apollo/87h/delta/info.json
 create mode 100644 keyboards/acheron/apollo/87h/gamma/info.json

(limited to 'keyboards/acheron/apollo/87h')

diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 04a440835f..1365b81774 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4150 // AP for AcheronProject
-#define PRODUCT_ID      0x8775 // For 87H + 3 (revision Delta)
-#define DEVICE_VER      0x0004 // Revision Delta
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         Apollo87H
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
new file mode 100644
index 0000000000..8f501970a5
--- /dev/null
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Apollo87H",
+    "usb": {
+        "pid": "0x8775",
+        "device_version": "0.0.4"
+    }
+}
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index a28e498dcc..451071f869 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4150 // AP for AcheronProject
-#define PRODUCT_ID      0x8774 // For 87H + 2 (revision Gamma)
-#define DEVICE_VER      0x0003 // Revision Gamma
-#define MANUFACTURER    AcheronProject
-#define PRODUCT         Apollo87H rev. Gamma
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
new file mode 100644
index 0000000000..6a7a382eaa
--- /dev/null
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Apollo87H rev. Gamma",
+    "usb": {
+        "pid": "0x8774",
+        "device_version": "0.0.3"
+    }
+}
diff --git a/keyboards/acheron/apollo/87h/info.json b/keyboards/acheron/apollo/87h/info.json
index e5d2c0d40d..7dbd896a18 100644
--- a/keyboards/acheron/apollo/87h/info.json
+++ b/keyboards/acheron/apollo/87h/info.json
@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "AcheronProject Apollo87H",
+    "manufacturer": "AcheronProject",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-- 
cgit v1.2.3