diff options
Diffstat (limited to 'keyboards/bastardkb/charybdis')
54 files changed, 179 insertions, 214 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h index ef99f3b631..68901305c4 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h @@ -19,17 +19,10 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index cbe8ac12e7..fec474f14d 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -3,6 +3,15 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "A1", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["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/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index 5196e2f5e9..ca068abe74 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -25,7 +25,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/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index a74239f706..e373627d51 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -18,8 +18,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h index 0a2db20561..d7b6d01bce 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h @@ -67,20 +67,6 @@ */ #define PERMISSIVE_HOLD -/** - * Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt - */ -#define IGNORE_MOD_TAP_INTERRUPT - /** Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h index 514a153623..6d24808af2 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h @@ -39,8 +39,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define SPLIT_HAND_PIN C14 // high = left, low = right // WS2812 RGB LED strip input and number of LEDs -# undef RGB_DI_PIN -# define RGB_DI_PIN A1 +# undef WS2812_DI_PIN +# define WS2812_DI_PIN A1 # undef RGB_MATRIX_MAXIMUM_BRIGHTNESS # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h index 5d9d4662f0..fd33c84758 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h @@ -24,18 +24,6 @@ /* Disable unused features. */ #define NO_ACTION_ONESHOT -/** - * \brief Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - */ -#define IGNORE_MOD_TAP_INTERRUPT - /* Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h index 909cd05978..dc0c6e4e03 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h @@ -18,22 +18,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { C7, F0, D7, E6, B4 } - -#define MATRIX_ROW_PINS_RIGHT \ - { F0, C6, D4, B5 } -#define MATRIX_COL_PINS_RIGHT \ - { C7, B7, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index 11cc51ad46..ec56b88c02 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -3,8 +3,22 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["C7", "F0", "D7", "E6", "B4"], + "rows": ["B7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["C7", "B7", "D7", "E6", "B4"], + "rows": ["F0", "C6", "D4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h index 510a55be41..3b91322247 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h @@ -17,17 +17,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 5c56d68554..a318e467df 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h index 304e89ce21..e6e2a4f216 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x5/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 \ - { GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT @@ -31,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP18 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 4b914a775f..100b53fc61 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -3,9 +3,18 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" + }, "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 b67408f28e..37e9d6c3b8 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h index d497261418..ee7745d41e 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x5/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 \ - { GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT @@ -31,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP22 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 4b914a775f..841975db3d 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -3,9 +3,18 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" + }, "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 b67408f28e..37e9d6c3b8 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 0138b9656f..6aa20712f6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/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 \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT @@ -33,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index 9e1c778cc3..465f54b42e 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -3,6 +3,15 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 3895209c6a..92ea9dfb4c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -27,6 +27,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart -WS2812_DRIVER = pwm DEBOUNCE_TYPE = asym_eager_defer_pk diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h index 93d897a4fe..985e79fabd 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h @@ -17,17 +17,10 @@ #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. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 9fa70f3ca1..c46230b5a0 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -3,6 +3,15 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "A1", + "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/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index 5196e2f5e9..ca068abe74 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -25,7 +25,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/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h index 19a2fb56f5..ba729aee3e 100644 --- a/keyboards/bastardkb/charybdis/3x6/config.h +++ b/keyboards/bastardkb/charybdis/3x6/config.h @@ -18,8 +18,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h index 0fea2772d2..f5c54c58ae 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h @@ -17,22 +17,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { D5, C7, F0, D7, E6, B4 } - -#define MATRIX_ROW_PINS_RIGHT \ - { F0, C6, D4, B5 } -#define MATRIX_COL_PINS_RIGHT \ - { F1, C7, B7, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 5a8b815e95..b816551a3e 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -3,8 +3,22 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D5", "C7", "F0", "D7", "E6", "B4"], + "rows": ["B7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F1", "C7", "B7", "D7", "E6", "B4"], + "rows": ["F0", "C6", "D4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h index ba2bd4ac36..3b91322247 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h @@ -17,17 +17,8 @@ #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 -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index d84a7f314c..e3aa2ae1bf 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, + "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/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h index 053d780161..e6e2a4f216 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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 @@ -31,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP18 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 4e1c96298d..4fd92418b3 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -3,9 +3,18 @@ "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": { + "pin": "GP0", + "driver": "vendor" + }, "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 b67408f28e..37e9d6c3b8 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h index e4afc5a866..ee7745d41e 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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 @@ -31,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP22 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 4e1c96298d..7dc1bcc85f 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -3,9 +3,18 @@ "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": { + "pin": "GP0", + "driver": "vendor" + }, "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 b67408f28e..37e9d6c3b8 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 658819f936..6aa20712f6 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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 @@ -33,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index b667f6d76a..33f416b49d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -3,6 +3,15 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3", + "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/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 3895209c6a..92ea9dfb4c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -27,6 +27,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart -WS2812_DRIVER = pwm DEBOUNCE_TYPE = asym_eager_defer_pk diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index e37df487fd..68901305c4 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -19,17 +19,10 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { B15, A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index ec2b0cbad0..d70a2168d6 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -3,6 +3,15 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "A1", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], + "rows": ["B15", "A2", "B8", "A8", "B9"] + }, + "diode_direction": "ROW2COL", "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 f9e94a34df..2258d4d25a 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -25,7 +25,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/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index 21887dca07..64b5158698 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -18,8 +18,6 @@ #pragma once -#define DIODE_DIRECTION ROW2COL - /* 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 44e81807ee..dc0c6e4e03 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h @@ -18,22 +18,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F1, B7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { D5, C7, F0, D7, E6, B4 } - -#define MATRIX_ROW_PINS_RIGHT \ - { D5, F0, C6, D4, B5 } -#define MATRIX_COL_PINS_RIGHT \ - { F1, C7, B7, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index c9921cd341..61c81c48d2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -3,8 +3,22 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D5", "C7", "F0", "D7", "E6", "B4"], + "rows": ["F1", "B7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F1", "C7", "B7", "D7", "E6", "B4"], + "rows": ["D5", "F0", "C6", "D4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu" diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h index 8e586b89b2..3b91322247 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h @@ -17,17 +17,8 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F4, F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index 9349712a41..86011a1550 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h index 3e7e3529c8..e6e2a4f216 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP15, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT @@ -31,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP18 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 6931f9e876..125865ee94 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -3,9 +3,18 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"], + "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" + }, "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 b67408f28e..37e9d6c3b8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h index 827267d2cf..ee7745d41e 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } -#define MATRIX_COL_PINS \ - { GP27, GP28, GP21, GP6, GP7, GP8 } - /* Handedness. */ #define MASTER_RIGHT @@ -31,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP22 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 6931f9e876..2c9903f8be 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -3,9 +3,18 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"], + "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "GP1" }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" + }, "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 b67408f28e..37e9d6c3b8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index fc4e3efadf..6aa20712f6 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F4, F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT @@ -33,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 0b7ea21560..298a111d38 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -3,6 +3,15 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 3895209c6a..92ea9dfb4c 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -27,6 +27,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart -WS2812_DRIVER = pwm DEBOUNCE_TYPE = asym_eager_defer_pk |