diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
| commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
| tree | 1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/tkw | |
| parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
| parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/tkw')
| -rw-r--r-- | keyboards/tkw/grandiceps/config.h | 3 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/info.json | 7 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/rev1/info.json | 6 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/rev1/rules.mk | 0 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/rev2/config.h | 5 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/rev2/info.json | 6 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/rules.mk | 2 |
7 files changed, 19 insertions, 10 deletions
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index b2b6008240..f9e9460b88 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -18,10 +18,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x7812 #define DEVICE_VER 0x0001 -#define MANUFACTURER tkw #define PRODUCT Grandiceps Split /* key matrix size */ diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 7a4324ffdc..dc4cf5a0ee 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -1,8 +1,11 @@ { - "keyboard_name": "grandiceps", + "manufacturer": "tkw", "url": "https://github.com/vattern/grandiceps", "maintainer": "vattern", - "manufacturer": "tkw", + "usb": { + "vid": "0xFEED", + "pid": "0x7812" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkw/grandiceps/rev1/info.json b/keyboards/tkw/grandiceps/rev1/info.json new file mode 100644 index 0000000000..34d2a94743 --- /dev/null +++ b/keyboards/tkw/grandiceps/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Grandiceps Split", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/tkw/grandiceps/rev1/rules.mk b/keyboards/tkw/grandiceps/rev1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/tkw/grandiceps/rev1/rules.mk diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h index 98b762087e..5810fe75bc 100644 --- a/keyboards/tkw/grandiceps/rev2/config.h +++ b/keyboards/tkw/grandiceps/rev2/config.h @@ -15,10 +15,5 @@ */ #pragma once -#undef DEVICE_VER -#define DEVICE_VER 0x0002 -#undef PRODUCT -#define PRODUCT Grandiceps Split rev2 - #define SPLIT_HAND_PIN B3 #define EEPROM_I2C_24LC64 diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/info.json new file mode 100644 index 0000000000..786f381c4f --- /dev/null +++ b/keyboards/tkw/grandiceps/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Grandiceps Split rev2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 8274edd22d..2220b16252 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -26,3 +26,5 @@ OLED_ENABLE = yes OLED_DRIVER = SSD1306 WS2812_DRIVER = pwm OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE + +DEFAULT_FOLDER = tkw/grandiceps/rev1 |