diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-06 08:59:44 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-06 08:59:44 +0000 |
commit | e9f9f99a3374ad46e9a2baf2fe35c3f1d0715d4b (patch) | |
tree | b7ade29c69055cf8a2aff9cc2914f1cff22c9c24 /keyboards/zj68 | |
parent | dd0ac80ee4662278f94452600363e5d74811b66c (diff) | |
parent | 0ff8c4f6fd8cce95d9e96060121208f85b4d02cd (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/zj68')
-rw-r--r-- | keyboards/zj68/config.h | 7 | ||||
-rw-r--r-- | keyboards/zj68/info.json | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index bca9bf72a0..355ad73aeb 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -19,13 +19,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 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Drop -#define PRODUCT ZJ68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 8495904dc4..ed903a6400 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "ZJ68", + "manufacturer": "Drop", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |