summaryrefslogtreecommitdiff
path: root/keyboards/phoenix
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-03 07:23:52 +0000
committerQMK Bot <hello@qmk.fm>2022-08-03 07:23:52 +0000
commit61a3fe4faca40c537dc179f58317a0229ae09ce2 (patch)
tree7a2f98cd295636d188dd3a6f93b4dd9bcad4c186 /keyboards/phoenix
parentd4f9eb5225feb7f2aad01d252b33401e3a80b870 (diff)
parentb6757d2380d32b5f60f61ffc42d27c40eb219208 (diff)
downloadqmk_firmware-61a3fe4faca40c537dc179f58317a0229ae09ce2.tar.gz
qmk_firmware-61a3fe4faca40c537dc179f58317a0229ae09ce2.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/phoenix')
-rw-r--r--keyboards/phoenix/config.h7
-rw-r--r--keyboards/phoenix/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/phoenix/config.h b/keyboards/phoenix/config.h
index 81fc3677ff..9fb090dec0 100644
--- a/keyboards/phoenix/config.h
+++ b/keyboards/phoenix/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x456B
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER ErgoKB
-#define PRODUCT Phoenix
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 7
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
index 65cdaaa338..85cffa1c31 100644
--- a/keyboards/phoenix/info.json
+++ b/keyboards/phoenix/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Phoenix",
+ "manufacturer": "ErgoKB",
"url": "ergokb.tw",
"maintainer": "ErgoKB via lschyi",
+ "usb": {
+ "vid": "0x456B",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ergodox": {
"layout": [