diff options
Diffstat (limited to 'keyboards/bastardkb')
141 files changed, 254 insertions, 516 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index c2ff6d458a..cbe8ac12e7 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis Nano (3x5) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index a21fd9e7ff..5196e2f5e9 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/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 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index 0849d5968a..a74239f706 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -18,15 +18,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROWS 8 // Rows are doubled-up. -#define MATRIX_COLS 5 - #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed. */ -#define DEBOUNCE 5 - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index 0c47d1a3ad..a09ef236ba 100644 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ b/keyboards/bastardkb/charybdis/3x5/info.json @@ -5,6 +5,7 @@ "pid": "0x1832", "vid": "0xA8F8" }, + "community_layouts": ["split_3x5_3"], "layout_aliases": { "LAYOUT_charybdis_3x5": "LAYOUT" }, diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h index 3ab7e56ebd..0a2db20561 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h @@ -43,7 +43,7 @@ * * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h index 8a9d40ac63..909cd05978 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h @@ -32,9 +32,6 @@ /* 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/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index b83dc6c3f8..11cc51ad46 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Nano (3x5) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index 22bd22652a..1176b482ae 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/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 # @@ -26,7 +20,6 @@ RGB_MATRIX_DRIVER = WS2812 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on # the trackball side). SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h index 2667ee9e7e..510a55be41 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h @@ -26,9 +26,6 @@ /* 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/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 78453c44ff..5c56d68554 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Nano (3x5) Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index 22bd22652a..1176b482ae 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/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 # @@ -26,7 +20,6 @@ RGB_MATRIX_DRIVER = WS2812 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on # the trackball side). SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h index cbdc3ae855..304e89ce21 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x5/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/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 98f436f52b..4b914a775f 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Nano (3x5) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 21a9506077..b67408f28e 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/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_3x5_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h index 3772044c15..d497261418 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x5/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/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 98f436f52b..4b914a775f 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Nano (3x5) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 21a9506077..b67408f28e 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/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_3x5_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index a06859b215..0138b9656f 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/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/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index b344c1cbfc..9e1c778cc3 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Nano (3x5) STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index e4a9ce289c..3895209c6a 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/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_3x5_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 54eda1eadf..9fa70f3ca1 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis Mini (3x6) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index a29e3e433d..5196e2f5e9 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/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 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h index 40d933f0b8..19a2fb56f5 100644 --- a/keyboards/bastardkb/charybdis/3x6/config.h +++ b/keyboards/bastardkb/charybdis/3x6/config.h @@ -18,15 +18,8 @@ #pragma once -/* 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 - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json index 92c424788f..1a4d15711f 100644 --- a/keyboards/bastardkb/charybdis/3x6/info.json +++ b/keyboards/bastardkb/charybdis/3x6/info.json @@ -3,6 +3,7 @@ "usb": { "pid": "0x1834" }, + "community_layouts": ["split_3x6_3"], "layout_aliases": { "LAYOUT_charybdis_3x6": "LAYOUT" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h index fa1a1c01f7..0fea2772d2 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h @@ -31,9 +31,6 @@ /* 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/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 7edaf111a9..5a8b815e95 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Mini (3x6) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index 54406bcc1d..7e5e593915 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/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,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h index e9d45e6796..ba2bd4ac36 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h @@ -26,9 +26,6 @@ /* 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/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index 02fe2e9ef3..d84a7f314c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Mini (3x6) Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index 54406bcc1d..7e5e593915 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/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,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x6_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h index 3f72897c56..053d780161 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 64c663c7c9..4e1c96298d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Mini (3x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 6ab474a76f..b67408f28e 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/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 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h index 1828aaa98b..e4afc5a866 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 64c663c7c9..4e1c96298d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Mini (3x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 6ab474a76f..b67408f28e 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/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 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 81c7e737a7..658819f936 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 8aa7bf24c9..b667f6d76a 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis Mini (3x6) STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 94cd8a0deb..3895209c6a 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/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 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index a42035157b..ec2b0cbad0 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis (4x6) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index 9015f3a8b2..f9e94a34df 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/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 # diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index 68d4438315..21887dca07 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -18,15 +18,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROWS 10 // Rows are doubled-up. -#define MATRIX_COLS 6 - #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed. */ -#define DEBOUNCE 5 - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h index 710c4c3587..44e81807ee 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h @@ -32,9 +32,6 @@ /* 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/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index e3924b49b2..c9921cd341 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis (4x6) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index fa5fe80405..f643c2d082 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/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 # diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h index 692a28b7be..8e586b89b2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h @@ -26,9 +26,6 @@ /* 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/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index 3acba65a6b..9349712a41 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis (4x6) Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index fa5fe80405..f643c2d082 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/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 # diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h index 53d88652e1..3e7e3529c8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/4x6/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/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 928a850860..6931f9e876 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis (4x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 13c1b39961..b67408f28e 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/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. diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h index 8fd108a506..827267d2cf 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/4x6/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/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 928a850860..6931f9e876 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis (4x6) Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 13c1b39961..b67408f28e 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/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. diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index b1b432c330..fc4e3efadf 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/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/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 932bf09a32..0b7ea21560 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Charybdis (4x6) STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 0847e9ce1f..3895209c6a 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c index 2000641f9a..c321af7aa9 100644 --- a/keyboards/bastardkb/charybdis/charybdis.c +++ b/keyboards/bastardkb/charybdis/charybdis.c @@ -304,7 +304,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { } # endif // !NO_CHARYBDIS_KEYCODES # endif // POINTING_DEVICE_ENABLE - if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < CHARYBDIS_SAFE_RANGE) || IS_MOUSEKEY(keycode)) { + if (IS_QK_KB(keycode) || IS_MOUSEKEY(keycode)) { debug_charybdis_config_to_console(&g_charybdis_config); } return true; diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h index f624c554f4..06142aded2 100644 --- a/keyboards/bastardkb/charybdis/charybdis.h +++ b/keyboards/bastardkb/charybdis/charybdis.h @@ -35,11 +35,7 @@ #ifdef POINTING_DEVICE_ENABLE # ifndef NO_CHARYBDIS_KEYCODES enum charybdis_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, @@ -47,7 +43,6 @@ enum charybdis_keycodes { SNIPING_MODE_TOGGLE, DRAGSCROLL_MODE, DRAGSCROLL_MODE_TOGGLE, - CHARYBDIS_SAFE_RANGE, }; # define DPI_MOD POINTER_DEFAULT_DPI_FORWARD diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h index 0fa403c0f3..ced39ef4a1 100644 --- a/keyboards/bastardkb/charybdis/config.h +++ b/keyboards/bastardkb/charybdis/config.h @@ -18,7 +18,6 @@ #pragma once -#include "config_common.h" /* Pointing device configuration. */ diff --git a/keyboards/bastardkb/charybdis/readme.md b/keyboards/bastardkb/charybdis/readme.md index dd0fca0015..01eef250cd 100644 --- a/keyboards/bastardkb/charybdis/readme.md +++ b/keyboards/bastardkb/charybdis/readme.md @@ -121,7 +121,7 @@ The Charybdis firmware defines a number of keycodes to leverage its features, na ``` #ifndef NO_CHARYBDIS_KEYCODES enum charybdis_keycodes { - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, @@ -129,7 +129,6 @@ enum charybdis_keycodes { SNIPING_MODE_TOGGLE, DRAGSCROLL_MODE, DRAGSCROLL_MODE_TOGGLE, - CHARYBDIS_SAFE_RANGE, }; #define DPI_MOD POINTER_DEFAULT_DPI_FORWARD @@ -143,20 +142,6 @@ enum charybdis_keycodes { #endif // !NO_CHARYBDIS_KEYCODES ``` -Users extending the keycode set themselves (either in their keymap, or in their userspace) must start at `CHARYBDIS_SAFE_RANGE` to avoid conflicts, _eg._: - -```c -enum userspace_keycodes { -#ifndef NO_CHARYBDIS_KEYCODES - MY_FIRST_KEYCODE = CHARYBDIS_SAFE_RANGE, -#else - MY_FIRST_KEYCODE = SAFE_RANGE, -#endif // !NO_CHARYBDIS_KEYCODES - MY_SECOND_KEYCODE, - … -}; -``` - To disable the custom keycodes, and reduce binary size, simply add a definition in `config.h`: ```c diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h index 8420898f4e..3a5898c546 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h @@ -27,9 +27,6 @@ #define SPLIT_HAND_PIN GP29 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN GP1 - /* CRC. */ #define CRC8_USE_TABLE #define CRC8_OPTIMIZE_SPEED diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json index 59f3b0d071..e4f48e6c7e 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json @@ -1,3 +1,8 @@ { - "keyboard_name": "Dilemma (3x5+2) Assembled" + "keyboard_name": "Dilemma (3x5+2) Assembled", + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk index df2f94792d..5db74a9d84 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # @@ -28,7 +22,6 @@ POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI. SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_2 # RP2040-specific options PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json index bbbecd7efa..a758541149 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/info.json @@ -3,6 +3,7 @@ "device_version": "1.0.0", "pid": "0x1835" }, + "community_layouts": ["split_3x5_2"], "layouts": { "LAYOUT_split_3x5_2": { "layout": [ diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h index cbe8e7bba7..2390d10ca5 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h @@ -41,7 +41,7 @@ * * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h index 4ac28ed1f9..67e9646845 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h @@ -33,9 +33,6 @@ // left one, uncomment the following line. //#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN GP1 - /* CRC. */ #define CRC8_USE_TABLE #define CRC8_OPTIMIZE_SPEED diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json index 38ce4738f9..aec0957ed6 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json @@ -1,3 +1,8 @@ { - "keyboard_name": "Dilemma (3x5+2) Splinky" + "keyboard_name": "Dilemma (3x5+2) Splinky", + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk index 292b71fe8b..1e33cc1086 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # @@ -28,7 +22,6 @@ POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C. SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_2 # RP2040-specific options PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 985d622fb6..a30b98a10a 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -27,9 +27,6 @@ #define SPLIT_HAND_PIN GP29 #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 // Per-key. // #define RGB_DI_PIN GP10 // Underglow. diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 777367903d..a4fe592587 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -4,6 +4,12 @@ "device_version": "2.0.0", "pid": "0x1835" }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040", + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h index 139b1f06ea..fce6c3a1f6 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h @@ -37,7 +37,7 @@ * Enable rapid switch from tap to hold. Disable auto-repeat when pressing key * twice, except for one-shot keys. */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c index 461976b276..30fef9bbeb 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ - KC_A, NAV, CAPSWRD, KC_SPC, SYM, KC_A + KC_A, NAV, CW_TOGG, KC_SPC, SYM, KC_A // ╰───────────────────────────╯ ╰──────────────────────────╯ ), diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index 73ee4ab1e0..5ab695a6c2 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # @@ -30,7 +24,6 @@ POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 # RP2040-specific options PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h index 7f0b5c266f..3ea785525c 100644 --- a/keyboards/bastardkb/dilemma/config.h +++ b/keyboards/bastardkb/dilemma/config.h @@ -18,18 +18,9 @@ #pragma once -#include "config_common.h" - -/* Key matrix configuration. */ - -#define MATRIX_ROWS 8 // Rows are doubled-up. -#define MATRIX_COLS 5 #define DIODE_DIRECTION ROW2COL -// Set 0 if debouncing isn't needed. -#define DEBOUNCE 5 - /* Pointing device configuration. */ // Enable use of pointing device on slave split. diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c index b474a24e7f..5452f9e7f6 100644 --- a/keyboards/bastardkb/dilemma/dilemma.c +++ b/keyboards/bastardkb/dilemma/dilemma.c @@ -308,7 +308,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { # endif // !NO_DILEMMA_KEYCODES # endif // POINTING_DEVICE_ENABLE debug_dilemma_config_to_console(&g_dilemma_config); - if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < DILEMMA_SAFE_RANGE) || IS_MOUSEKEY(keycode)) { + if (IS_QK_KB(keycode) || IS_MOUSEKEY(keycode)) { debug_dilemma_config_to_console(&g_dilemma_config); } return true; diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h index 68d86b03ce..f2c0784533 100644 --- a/keyboards/bastardkb/dilemma/dilemma.h +++ b/keyboards/bastardkb/dilemma/dilemma.h @@ -32,11 +32,7 @@ #ifdef POINTING_DEVICE_ENABLE # ifndef NO_DILEMMA_KEYCODES enum dilemma_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, @@ -44,7 +40,6 @@ enum dilemma_keycodes { SNIPING_MODE_TOGGLE, DRAGSCROLL_MODE, DRAGSCROLL_MODE_TOGGLE, - DILEMMA_SAFE_RANGE, }; # define DPI_MOD POINTER_DEFAULT_DPI_FORWARD diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index 8e09212116..a701797dc0 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Scylla Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index cf2041ea1c..b68437c19e 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/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 # diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h index 043547be52..0f41dca37e 100644 --- a/keyboards/bastardkb/scylla/config.h +++ b/keyboards/bastardkb/scylla/config.h @@ -18,17 +18,9 @@ #pragma once -#include "config_common.h" - -/* Key matrix configuration. */ -#define MATRIX_ROWS 10 // 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 58 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h index 3b2fa15b96..6119f2738b 100644 --- a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h +++ b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h @@ -28,15 +28,12 @@ #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -// #define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // Apply the modifier on keys that are tapped during a short hold of a modtap // #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#define FORCE_NKRO
\ No newline at end of file +#define FORCE_NKRO diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c index 9f497e2c14..a51f5b9d38 100644 --- a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c +++ b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c @@ -169,12 +169,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CM_SPAR: - return true; - default: - return false; +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { + if (keycode == CM_SPAR) { + return false; + } else if (QK_MOD_TAP <= keycode && keycode <= QK_MOD_TAP_MAX) { + return true; + } else { + return false; } } diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h index d7baf99376..335f968e2a 100644 --- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h +++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h index 0990e6d068..967a8c6c53 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/config.h +++ b/keyboards/bastardkb/scylla/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/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json index a4949aaf5f..1ed2cee71d 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Scylla Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index 0c131a2eaf..985f9489c2 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/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 # diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h index 698f6e426f..e9691010ed 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/config.h +++ b/keyboards/bastardkb/scylla/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/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json index 8488a2e337..4674e238a6 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Scylla Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index 0c131a2eaf..985f9489c2 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/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 # diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h index 5f678fb331..f65dcfb0b3 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h +++ b/keyboards/bastardkb/scylla/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/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json index e6bcc6ca2f..6d3edbd0ee 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Scylla Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index 8dfc0256ab..8e2235ee9f 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/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. diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h index 56020397da..09d5af43c8 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h +++ b/keyboards/bastardkb/scylla/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/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json index e6bcc6ca2f..6d3edbd0ee 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Scylla Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index 8dfc0256ab..8e2235ee9f 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/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. diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h index 578e23f40a..5528531b91 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/config.h +++ b/keyboards/bastardkb/scylla/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/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index 7963834a79..eccfea99f4 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Scylla STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 39fc183e1d..70f7784de6 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index 2e0f758704..b058d2424a 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Skeletyl Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index 4ecd8c6924..b68437c19e 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/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_3x5_3 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h index 82a07c5921..c1e0e0aa19 100644 --- a/keyboards/bastardkb/skeletyl/config.h +++ b/keyboards/bastardkb/skeletyl/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 5 #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed. */ -#define DEBOUNCE 5 - /* RGB settings. */ #define RGBLED_NUM 36 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index 799f630124..90568ef1fd 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json @@ -3,6 +3,7 @@ "usb": { "pid": "0x1830" }, + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h index fd2101ec55..f98185755f 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h +++ b/keyboards/bastardkb/skeletyl/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/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json index 0d20c14c3d..392e3168ff 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Skeletyl Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index 399e03a2a5..985f9489c2 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/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_3x5_3 diff --git a/keyboards/bastardkb/skeletyl/v1/info.json b/keyboards/bastardkb/skeletyl/v1/info.json deleted file mode 100644 index ad889c2304..0000000000 --- a/keyboards/bastardkb/skeletyl/v1/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usb": { - "device_version": "1.0.0" - } -} diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h index 5d4e48d49d..6f001c5e24 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h +++ b/keyboards/bastardkb/skeletyl/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/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json index b339ca877c..ae98ff793a 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Skeletyl Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index 399e03a2a5..985f9489c2 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/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_3x5_3 diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h index 02a8bd6551..7fef28b05e 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h +++ b/keyboards/bastardkb/skeletyl/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/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json index cdcf967c35..a39c13a0ae 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Skeletyl Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index 1ce16352dd..8e2235ee9f 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/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_3x5_3 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h index e33ced273d..eda378df84 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h +++ b/keyboards/bastardkb/skeletyl/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/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json index cdcf967c35..a39c13a0ae 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Skeletyl Splinky", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index 1ce16352dd..8e2235ee9f 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/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_3x5_3 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h index 44acd40e7b..86bbdd199b 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h +++ b/keyboards/bastardkb/skeletyl/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/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index 34e40c9b38..257eb6f62e 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Skeletyl STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index ff20b0c742..70f7784de6 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/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_3x5_3 SERIAL_DRIVER = usart WS2812_DRIVER = pwm diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h index 213cfebf89..7a273050c0 100644 --- a/keyboards/bastardkb/tbk/config.h +++ b/keyboards/bastardkb/tbk/config.h @@ -17,8 +17,6 @@ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 #define DIODE_DIRECTION ROW2COL #define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 } #define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 } @@ -37,6 +35,5 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define DEBOUNCE 5 -#define SOFT_SERIAL_PIN D0 + #define MASTER_RIGHT diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 9529c1305b..22f10cee96 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -5,6 +5,11 @@ "device_version": "0.0.1", "pid": "0x1828" }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_4x6_5": { "layout": [ diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h index d7baf99376..335f968e2a 100644 --- a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h +++ b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk index 070c6b27ad..323b24ba20 100644 --- a/keyboards/bastardkb/tbk/rules.mk +++ b/keyboards/bastardkb/tbk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # 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 |