summaryrefslogtreecommitdiff
path: root/keyboards/tgr/tris
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-04 01:36:14 +0000
committerQMK Bot <hello@qmk.fm>2022-08-04 01:36:14 +0000
commit88cfd55b8c5073155eea272965e7ae0244777ef1 (patch)
tree71529683c6ba13f233b9433c4c1772347ad8956f /keyboards/tgr/tris
parent4e50de3a4ba8376952eb3e97bc16346a07f47a08 (diff)
parent17176daf26ae17b8ae54312217555f1bfed782c1 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/tgr/tris')
-rw-r--r--keyboards/tgr/tris/config.h6
-rw-r--r--keyboards/tgr/tris/info.json8
2 files changed, 7 insertions, 7 deletions
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
index 131add14cd..eed74f07e0 100644
--- a/keyboards/tgr/tris/config.h
+++ b/keyboards/tgr/tris/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0x5447 //TG
-#define PRODUCT_ID 0x5452 //TR
-#define DEVICE_VER 0x0001
-#define MANUFACTURER TGR
-#define PRODUCT Tris
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 4
diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json
index c4288ac14b..e557935785 100644
--- a/keyboards/tgr/tris/info.json
+++ b/keyboards/tgr/tris/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "TGR Tris",
+ "keyboard_name": "Tris",
+ "manufacturer": "TGR",
"url": "",
"maintainer": "halfenergized",
+ "usb": {
+ "vid": "0x5447",
+ "pid": "0x5452",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_6x4": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}]