diff options
Diffstat (limited to 'keyboards/bastardkb/tbkmini')
17 files changed, 42 insertions, 43 deletions
diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h index ba0c93ff93..b5166aed2a 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/config.h +++ b/keyboards/bastardkb/tbkmini/blackpill/config.h @@ -19,12 +19,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 025b442468..2fb63a0684 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], + "rows": ["A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "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 b68437c19e..35c9c4e11f 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -23,7 +23,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes EEPROM_DRIVER = spi -WS2812_DRIVER = pwm SERIAL_DRIVER = usart DEBOUNCE_TYPE = asym_eager_defer_pk diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h index 9c2e0f8327..06c6e3ada4 100644 --- a/keyboards/bastardkb/tbkmini/config.h +++ b/keyboards/bastardkb/tbkmini/config.h @@ -18,9 +18,6 @@ #pragma once - -#define DIODE_DIRECTION ROW2COL - /* RGB settings. */ #define RGBLED_NUM 42 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h index c17e20b3d7..384e19c3d2 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h @@ -18,12 +18,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B5, F7, F6, B6 } -#define MATRIX_COL_PINS \ - { B4, E6, C6, B1, B3, B2 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index 4fee403604..bc311eb815 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], + "rows": ["B5", "F7", "F6", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h index 01ce7edc7c..178bafa5cc 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index d91729481f..4e9bafbaf5 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h index d5da5febdf..00f0dbf1f3 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index 870f9db26e..852bc94072 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -3,9 +3,17 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, + "ws2812": { + "driver": "vendor" + }, "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 8e2235ee9f..e60131bda0 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -24,4 +24,3 @@ RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes 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 8d60f74a6f..ff5d7db4ff 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index 870f9db26e..06acfec57f 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -3,9 +3,17 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, + "ws2812": { + "driver": "vendor" + }, "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 8e2235ee9f..e60131bda0 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -24,4 +24,3 @@ RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes 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 e40513cae8..4e5b142aa3 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index f8901144af..ec8c6f4f14 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 70f7784de6..2c92eda3f9 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -22,6 +22,5 @@ RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart -WS2812_DRIVER = pwm DEBOUNCE_TYPE = asym_eager_defer_pk |