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/at_at/660m | |
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/at_at/660m')
-rw-r--r-- | keyboards/at_at/660m/config.h | 9 | ||||
-rw-r--r-- | keyboards/at_at/660m/info.json | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h index 5a53e8c38a..cdb9b81967 100644 --- a/keyboards/at_at/660m/config.h +++ b/keyboards/at_at/660m/config.h @@ -17,19 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* Ensure we jump to bootloader if the RESET keycode was pressed */ +/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE /* LSE clock */ #define STM32_LSECLK 32768 -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA22A -#define PRODUCT_ID 0x6600 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AT-AT -#define PRODUCT 660M - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json index e5282485fb..1558e2d058 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "AT-AT 660M", + "keyboard_name": "660M", + "manufacturer": "AT-AT", "url": "", "maintainer": "adrientetar", + "usb": { + "vid": "0xA22A", + "pid": "0x6600", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |