summaryrefslogtreecommitdiff
path: root/keyboards/fractal
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-27 21:44:42 +0000
committerQMK Bot <hello@qmk.fm>2022-07-27 21:44:42 +0000
commit7bb73306d640a7453462f76c9d22459b5356a9da (patch)
tree5b0acb1a7efbe5155ea732af3cc95bb307f1fe3d /keyboards/fractal
parent5055c9a74b0b88cb164f600963df40351ce4d5f7 (diff)
parent23f365b6014634bf9f67ed3515853bf8c4372615 (diff)
downloadqmk_firmware-7bb73306d640a7453462f76c9d22459b5356a9da.tar.gz
qmk_firmware-7bb73306d640a7453462f76c9d22459b5356a9da.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/fractal')
-rwxr-xr-xkeyboards/fractal/config.h7
-rw-r--r--keyboards/fractal/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h
index b9aeac3855..c494f6aa77 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER KeyPCB
-#define PRODUCT Fractal
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
index 7d7a2ba5a4..7d39a296d3 100644
--- a/keyboards/fractal/info.json
+++ b/keyboards/fractal/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Fractal",
+ "manufacturer": "KeyPCB",
"url": "https://keypcb.bigcartel.com/product/fractal-keyboard-group-buy",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]