diff options
| author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
|---|---|---|
| committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
| commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
| tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/melgeek/mj61 | |
| parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
| parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
| download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip | |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/melgeek/mj61')
| -rw-r--r-- | keyboards/melgeek/mj61/config.h | 7 | ||||
| -rw-r--r-- | keyboards/melgeek/mj61/info.json | 6 | ||||
| -rw-r--r-- | keyboards/melgeek/mj61/rev1/config.h | 1 | ||||
| -rw-r--r-- | keyboards/melgeek/mj61/rev2/config.h | 1 |
4 files changed, 6 insertions, 9 deletions
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h index 0b5bd9ff48..407beba1e8 100644 --- a/keyboards/melgeek/mj61/config.h +++ b/keyboards/melgeek/mj61/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xEDED -#define PRODUCT_ID 0xED61 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MelGeek -#define PRODUCT MJ61 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json index 52c98ecdab..559ea8da32 100644 --- a/keyboards/melgeek/mj61/info.json +++ b/keyboards/melgeek/mj61/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "MJ61", + "manufacturer": "MelGeek", "url": "", "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0xED61", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h index 9d73a4fe96..bba46db2dd 100644 --- a/keyboards/melgeek/mj61/rev1/config.h +++ b/keyboards/melgeek/mj61/rev1/config.h @@ -29,7 +29,6 @@ #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } #define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h index 616426df65..e17f291934 100644 --- a/keyboards/melgeek/mj61/rev2/config.h +++ b/keyboards/melgeek/mj61/rev2/config.h @@ -29,7 +29,6 @@ #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } #define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW |