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/tkw/stoutgat | |
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/tkw/stoutgat')
-rw-r--r-- | keyboards/tkw/stoutgat/v1/config.h | 7 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v1/info.json | 6 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/config.h | 7 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/f411/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/info.json | 8 |
5 files changed, 14 insertions, 15 deletions
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h index 96471e443d..787c927039 100644 --- a/keyboards/tkw/stoutgat/v1/config.h +++ b/keyboards/tkw/stoutgat/v1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7811 -#define DEVICE_VER 0x0001 -#define MANUFACTURER TKW -#define PRODUCT stoutgat - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 @@ -34,6 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENCODERS_PAD_A { B4, B0 } #define ENCODERS_PAD_B { B3, B1 } -#define UNUSED_PINS #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json index d649a48b5b..22be9b3ae2 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "stoutgat", + "manufacturer": "TKW", "url": "https://github.com/vattern/stoutgat", "maintainer": "vattern", + "usb": { + "vid": "0xFEED", + "pid": "0x7811", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_encoder": { "layout": [ diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index 73b3eef90b..989cc1a76e 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7811 -#define DEVICE_VER 0x0002 -#define MANUFACTURER TKW -#define PRODUCT Stoutgat v2 65% - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk index b32a8b7f5b..c25a64f4b3 100644 --- a/keyboards/tkw/stoutgat/v2/f411/rules.mk +++ b/keyboards/tkw/stoutgat/v2/f411/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index 6946e3e0bc..bafe4d6fc1 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "stoutgat/v2", + "keyboard_name": "Stoutgat v2 65%", + "manufacturer": "TKW", "url": "https://github.com/vattern/stoutgatv2", "maintainer": "vattern", + "usb": { + "vid": "0xFEED", + "pid": "0x7811", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_encoder": { "layout": [ |