diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-03 14:59:13 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-03 14:59:13 +0000 |
| commit | e93124f05c906472bea8e95c49378b4dafc5c0b8 (patch) | |
| tree | 6ee106868dee7a3e07d56f70aade0b6932d6c119 /keyboards/qwertykeys | |
| parent | 4c81d4e526518754e1937b692619667691a32c59 (diff) | |
| parent | 5f6cf24294c789963415f615db2fa24e46f89fa6 (diff) | |
| download | qmk_firmware-e93124f05c906472bea8e95c49378b4dafc5c0b8.tar.gz qmk_firmware-e93124f05c906472bea8e95c49378b4dafc5c0b8.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/qwertykeys')
| -rw-r--r-- | keyboards/qwertykeys/qk65/hotswap/config.h | 8 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/hotswap/info.json | 8 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/config.h | 8 | ||||
| -rw-r--r-- | keyboards/qwertykeys/qk65/solder/info.json | 8 |
4 files changed, 14 insertions, 18 deletions
diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h index 8dfaf1648d..51b4780c22 100644 --- a/keyboards/qwertykeys/qk65/hotswap/config.h +++ b/keyboards/qwertykeys/qk65/hotswap/config.h @@ -19,14 +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 0x4F53 //0x4F53 for qwertykeys -#define PRODUCT_ID 0x514B //0x514B QK for QK65 -#define DEVICE_VER 0x0001 -#define MANUFACTURER qwertykeys -#define PRODUCT QK65 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index 21d30bd491..a4684a27db 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "qk65", + "keyboard_name": "QK65 Hotswap", + "manufacturer": "qwertykeys", "url": "", "maintainer": "qwertykeys", + "usb": { + "vid": "0x4F53", + "pid": "0x514B", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_hotswap": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h index be8c11bbda..b12d6d4121 100644 --- a/keyboards/qwertykeys/qk65/solder/config.h +++ b/keyboards/qwertykeys/qk65/solder/config.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter s*/ -#define VENDOR_ID 0x4F53 // 0x4F53 for qwertykeys -#define PRODUCT_ID 0x5153 //0x5153 QS for QK65 Solder -#define DEVICE_VER 0x0001 -#define MANUFACTURER qwertykeys -#define PRODUCT QK65 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 53c5179f42..332f881cb3 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "qk65", + "keyboard_name": "QK65 Solder", + "manufacturer": "qwertykeys", "url": "", "maintainer": "qwertykeys", + "usb": { + "vid": "0x4F53", + "pid": "0x5153", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_solder": "LAYOUT_all", "LAYOUT_iso": "LAYOUT_65_iso_blocker" |