From be5b1a24bf650d9bc0bff4cf3b27a9c641d262fd Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 3 Aug 2022 04:39:00 +1000
Subject: Move keyboard USB IDs and strings to data driven: O (#17874)
---
keyboards/ogre/ergo_single/config.h | 7 -------
keyboards/ogre/ergo_single/info.json | 6 ++++++
keyboards/ogre/ergo_split/config.h | 7 -------
keyboards/ogre/ergo_split/info.json | 6 ++++++
4 files changed, 12 insertions(+), 14 deletions(-)
(limited to 'keyboards/ogre')
diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
index 5c0c09b3c7..788ace6f5c 100644
--- a/keyboards/ogre/ergo_single/config.h
+++ b/keyboards/ogre/ergo_single/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 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER ctrlshiftba
-#define PRODUCT ergo_single
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 7
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
index ca9223545d..fd446099f5 100644
--- a/keyboards/ogre/ergo_single/info.json
+++ b/keyboards/ogre/ergo_single/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Ogre Ergo Single",
+ "manufacturer": "ctrlshiftba",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index 4bf45c05e7..43a9894f3d 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/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 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER ctrlshiftba
-#define PRODUCT ergo_split
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 7
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
index eaf5c4e389..2e3e2f73a8 100644
--- a/keyboards/ogre/ergo_split/info.json
+++ b/keyboards/ogre/ergo_split/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Ogre Ergo Split",
+ "manufacturer": "ctrlshiftba",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
--
cgit v1.2.3