diff options
| author | zvecr <git@zvecr.com> | 2022-07-29 17:30:33 +0100 |
|---|---|---|
| committer | zvecr <git@zvecr.com> | 2022-07-29 17:30:33 +0100 |
| commit | ade2eb1e751be2918b901bfe4352a71f1d54e2a2 (patch) | |
| tree | 4a2c409651420d4c99296aebeaaf0514d2cb4a71 /keyboards/jm60 | |
| parent | 1050cf24536378d534c6163fd1ae5ae3fe46ccc4 (diff) | |
| parent | 394cf7c41e24f966d38b9c8cc9bbc2faca905e2a (diff) | |
| download | qmk_firmware-ade2eb1e751be2918b901bfe4352a71f1d54e2a2.tar.gz qmk_firmware-ade2eb1e751be2918b901bfe4352a71f1d54e2a2.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/jm60')
| -rw-r--r-- | keyboards/jm60/config.h | 7 | ||||
| -rw-r--r-- | keyboards/jm60/info.json | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h index 113c6b4dfb..d3b5ec7243 100644 --- a/keyboards/jm60/config.h +++ b/keyboards/jm60/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6464 -#define DEVICE_VER 0x0001 -#define MANUFACTURER JMWS -#define PRODUCT JM60 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/jm60/info.json b/keyboards/jm60/info.json index cdb0da4671..5ad1053aa9 100644 --- a/keyboards/jm60/info.json +++ b/keyboards/jm60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "JM60", + "manufacturer": "JMWS", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6464", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ |