summaryrefslogtreecommitdiff
path: root/keyboards/merge/um70
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-03 17:15:43 +1000
committerGitHub <noreply@github.com>2022-08-03 17:15:43 +1000
commit3da6575e2480d46399be01c21270c57420e0f16d (patch)
treef3438c1402e56256dd0c2bdd0775711edae56043 /keyboards/merge/um70
parent1b92c204c10594fce6a715710c277a748a4fdc68 (diff)
Move keyboard USB IDs and strings to data driven: M (#17859)
Diffstat (limited to 'keyboards/merge/um70')
-rw-r--r--keyboards/merge/um70/config.h6
-rw-r--r--keyboards/merge/um70/info.json6
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index a1374aa9a3..1556626e52 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -16,12 +16,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x4D65
-#define PRODUCT_ID 0x3222
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Merge
-#define PRODUCT UM-70
-
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index f0fc07a95e..20b0d918f7 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "UM-70",
+ "manufacturer": "Merge",
"url": "https://mergedesign.store/um-70",
"maintainer": "duoshock",
+ "usb": {
+ "vid": "0x4D65",
+ "pid": "0x3222",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_rspace_2u_bksp": {
"layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0, "w":2}, {"x":17.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":17.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2, "w":2.25}, {"x":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3, "w":1.75}, {"x":16.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}]