diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-06 05:50:30 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-06 05:50:30 +0000 |
commit | ec5186f0f9e2d1910331785f1410be5892058ee4 (patch) | |
tree | 3647aa4ca4bc826ec24fa1baf4e4a9e7cd79ccf5 /keyboards/wsk/g4m3ralpha | |
parent | 7bbc1b21dd97d0d1577b5ed288adc48475512497 (diff) | |
parent | 10ad2389442c00c32714f6e9a6766e9e7bdec2c2 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/wsk/g4m3ralpha')
-rw-r--r-- | keyboards/wsk/g4m3ralpha/config.h | 7 | ||||
-rw-r--r-- | keyboards/wsk/g4m3ralpha/info.json | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h index 071b6ac04f..5dd30538fc 100644 --- a/keyboards/wsk/g4m3ralpha/config.h +++ b/keyboards/wsk/g4m3ralpha/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5753 // "WS" - Worldspawn00 -#define PRODUCT_ID 0x56D9 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Worldspawn00 -#define PRODUCT G4M3Ralpha - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json index 532bbf37b0..109da40b52 100644 --- a/keyboards/wsk/g4m3ralpha/info.json +++ b/keyboards/wsk/g4m3ralpha/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "G4M3R Alpha", + "keyboard_name": "G4M3Ralpha", + "manufacturer": "Worldspawn00", "url": "", "maintainer": "Worldspawn00", + "usb": { + "vid": "0x5753", + "pid": "0x56D9", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"!", "x":0.5, "y":0}, {"label":"@", "x":1.5, "y":0}, {"label":"#", "x":2.5, "y":0}, {"label":"$", "x":3.5, "y":0}, {"label":"%", "x":4.5, "y":0}, {"label":"Q", "x":0, "y":1}, {"label":"W", "x":1, "y":1}, {"label":"E", "x":2, "y":1}, {"label":"R", "x":3, "y":1}, {"label":"T", "x":4, "y":1}, {"label":"Y", "x":5, "y":1}, {"label":"U", "x":6, "y":1}, {"label":"I", "x":7, "y":1}, {"label":"O", "x":8, "y":1}, {"label":"P", "x":9, "y":1}, {"label":"A", "x":0, "y":2}, {"label":"S", "x":1, "y":2}, {"label":"D", "x":2, "y":2}, {"label":"F", "x":3, "y":2}, {"label":"G", "x":4, "y":2}, {"label":"H", "x":5, "y":2}, {"label":"J", "x":6, "y":2}, {"label":"K", "x":7, "y":2}, {"label":"L", "x":8, "y":2}, {"label":"Enter", "x":9, "y":2}, {"label":"Z", "x":0.5, "y":3}, {"label":"X", "x":1.5, "y":3}, {"label":"C", "x":2.5, "y":3}, {"label":"V", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}] |