aboutsummaryrefslogtreecommitdiff
path: root/keyboards/tkw
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tkw')
-rw-r--r--keyboards/tkw/grandiceps/config.h4
-rw-r--r--keyboards/tkw/grandiceps/info.json19
-rw-r--r--keyboards/tkw/grandiceps/rev1/keyboard.json (renamed from keyboards/tkw/grandiceps/rev1/info.json)0
-rw-r--r--keyboards/tkw/grandiceps/rev1/rules.mk0
-rw-r--r--keyboards/tkw/grandiceps/rev2/config.h1
-rw-r--r--keyboards/tkw/grandiceps/rev2/keyboard.json (renamed from keyboards/tkw/grandiceps/rev2/info.json)8
-rw-r--r--keyboards/tkw/grandiceps/rev2/rules.mk1
-rw-r--r--keyboards/tkw/grandiceps/rules.mk18
-rw-r--r--keyboards/tkw/stoutgat/v1/keyboard.json (renamed from keyboards/tkw/stoutgat/v1/info.json)7
-rw-r--r--keyboards/tkw/stoutgat/v1/rules.mk14
-rw-r--r--keyboards/tkw/stoutgat/v2/config.h4
-rw-r--r--keyboards/tkw/stoutgat/v2/f411/info.json5
-rw-r--r--keyboards/tkw/stoutgat/v2/f411/keyboard.json3
-rw-r--r--keyboards/tkw/stoutgat/v2/f411/rules.mk0
-rw-r--r--keyboards/tkw/stoutgat/v2/info.json8
-rw-r--r--keyboards/tkw/stoutgat/v2/rules.mk17
16 files changed, 45 insertions, 64 deletions
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index a963fbfb51..a02e14f91f 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -20,5 +20,5 @@
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index de4fa5cd49..13bc1e7acf 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -4,7 +4,19 @@
"maintainer": "vattern",
"usb": {
"vid": "0xFEED",
- "pid": "0x7812"
+ "pid": "0x7812",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true
},
"ws2812": {
"pin": "B1",
@@ -39,6 +51,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "A15",
"matrix_pins": {
"right": {
@@ -50,9 +63,7 @@
"qmk": {
"tap_keycode_delay": 10
},
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411",
+ "development_board": "blackpill_f411",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/tkw/grandiceps/rev1/info.json b/keyboards/tkw/grandiceps/rev1/keyboard.json
index 34d2a94743..34d2a94743 100644
--- a/keyboards/tkw/grandiceps/rev1/info.json
+++ b/keyboards/tkw/grandiceps/rev1/keyboard.json
diff --git a/keyboards/tkw/grandiceps/rev1/rules.mk b/keyboards/tkw/grandiceps/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/tkw/grandiceps/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h
index 5810fe75bc..83f1b56157 100644
--- a/keyboards/tkw/grandiceps/rev2/config.h
+++ b/keyboards/tkw/grandiceps/rev2/config.h
@@ -15,5 +15,4 @@
*/
#pragma once
-#define SPLIT_HAND_PIN B3
#define EEPROM_I2C_24LC64
diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/keyboard.json
index cd80948196..b0f9970bcd 100644
--- a/keyboards/tkw/grandiceps/rev2/info.json
+++ b/keyboards/tkw/grandiceps/rev2/keyboard.json
@@ -5,5 +5,13 @@
},
"eeprom": {
"driver": "i2c"
+ },
+ "features": {
+ "pointing_device": true
+ },
+ "split": {
+ "handedness": {
+ "pin": "B3"
+ }
}
}
diff --git a/keyboards/tkw/grandiceps/rev2/rules.mk b/keyboards/tkw/grandiceps/rev2/rules.mk
index 20f2871924..0cac88f7f7 100644
--- a/keyboards/tkw/grandiceps/rev2/rules.mk
+++ b/keyboards/tkw/grandiceps/rev2/rules.mk
@@ -1,2 +1 @@
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pimoroni_trackball
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 86483ba920..01fa521763 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -1,21 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
-OLED_ENABLE = yes
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/keyboard.json
index 9d7a60a4b9..2dd46af494 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x7811",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
"rows": ["D1", "D0", "A0", "A1", "A2"]
diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk
index 8dca0665f7..c2ee0bc86f 100644
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index bf68edcfae..79f47b9bb3 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -18,8 +18,8 @@
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkw/stoutgat/v2/f411/info.json b/keyboards/tkw/stoutgat/v2/f411/info.json
deleted file mode 100644
index 2517a82403..0000000000
--- a/keyboards/tkw/stoutgat/v2/f411/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/tkw/stoutgat/v2/f411/keyboard.json b/keyboards/tkw/stoutgat/v2/f411/keyboard.json
new file mode 100644
index 0000000000..a41c5f4dd1
--- /dev/null
+++ b/keyboards/tkw/stoutgat/v2/f411/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f411"
+}
diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/tkw/stoutgat/v2/f411/rules.mk
+++ /dev/null
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index b1232f6816..dbb227b0fd 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,14 @@
"pid": "0x7811",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"ws2812": {
"pin": "B1",
"driver": "pwm"
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
index 477d680add..1a660af26c 100644
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/rules.mk
@@ -1,18 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-
DEFAULT_FOLDER = tkw/stoutgat/v2/f411