diff options
| author | QMK Bot <hello@qmk.fm> | 2022-07-25 23:04:48 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-07-25 23:04:48 +0000 |
| commit | 1e651dbdb0815013da00804257df67aab5e28167 (patch) | |
| tree | a9e7fe329803a6ced4e8644615ebf5b84a47e6a7 /keyboards/ckeys/washington | |
| parent | 4baed8037d18d73f3937006c9f0379c3e15d6125 (diff) | |
| parent | a939293aca697cb263f4972dbb1521d273fbf499 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ckeys/washington')
| -rw-r--r-- | keyboards/ckeys/washington/config.h | 7 | ||||
| -rw-r--r-- | keyboards/ckeys/washington/info.json | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h index 2d5a8ce3ad..643f61c5d6 100644 --- a/keyboards/ckeys/washington/config.h +++ b/keyboards/ckeys/washington/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x002A -#define DEVICE_VER 0x0001 -#define MANUFACTURER merlin04 -#define PRODUCT Washington Macropad - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json index 304e4f3354..20e83faf2b 100644 --- a/keyboards/ckeys/washington/info.json +++ b/keyboards/ckeys/washington/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "washington", + "keyboard_name": "Washington Macropad", + "manufacturer": "merlin04", "url": "https://keypcb.xyz/ViewPage/Washington", "maintainer": "merlin04", + "usb": { + "vid": "0xFEED", + "pid": "0x002A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}] |