diff options
Diffstat (limited to 'keyboards/bastardkb/tbkmini')
19 files changed, 35 insertions, 71 deletions
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 24664f13ef..025b442468 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "TBK Mini Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index 702ed34356..b68437c19e 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -25,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h index 5b508842fe..9c2e0f8327 100644 --- a/keyboards/bastardkb/tbkmini/config.h +++ b/keyboards/bastardkb/tbkmini/config.h @@ -18,17 +18,9 @@ #pragma once -#include "config_common.h" - -/* Key matrix configuration. */ -#define MATRIX_ROWS 8 // Rows are doubled-up. -#define MATRIX_COLS 6 #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed. */ -#define DEBOUNCE 5 - /* RGB settings. */ #define RGBLED_NUM 42 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index cb4d3378bc..2056aeeb5d 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -3,6 +3,7 @@ "usb": { "pid": "0x1828" }, + "community_layouts": ["split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { "layout": [ diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h index 5a9ff87efa..c17e20b3d7 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h @@ -27,8 +27,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN D0 - /* RGB settings. */ #define RGB_DI_PIN D2 diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index f9ebb18069..4fee403604 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "TBK Mini Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index 380f48e73b..985f9489c2 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -24,4 +18,3 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together wi RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h index 1feeac092b..01ce7edc7c 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v2/elitec/config.h @@ -26,8 +26,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN D2 - /* RGB settings. */ #define RGB_DI_PIN D3 diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index a0ef2767f9..d91729481f 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "TBK Mini Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index 380f48e73b..985f9489c2 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -24,4 +18,3 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together wi RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h index ed0b4a6a54..d5da5febdf 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h @@ -31,9 +31,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN GP1 - /* RGB settings. */ #define RGB_DI_PIN GP0 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index b0b05fba8a..870f9db26e 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "TBK Mini Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index 6b55f6e595..8e2235ee9f 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. @@ -28,7 +22,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h index 849fcec968..8d60f74a6f 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h @@ -31,9 +31,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN GP1 - /* RGB settings. */ #define RGB_DI_PIN GP0 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index b0b05fba8a..870f9db26e 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "TBK Mini Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index 6b55f6e595..8e2235ee9f 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. @@ -28,7 +22,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h index 0c66a8075b..e40513cae8 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h @@ -32,9 +32,6 @@ // #define SPLIT_HAND_PIN A0 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN D2 - /* RGB settings. */ #define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index 7595dab436..f8901144af 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -2,5 +2,10 @@ "keyboard_name": "TBK Mini STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 9b36bf7ed5..70f7784de6 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options @@ -25,7 +20,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 SERIAL_DRIVER = usart WS2812_DRIVER = pwm |