diff options
Diffstat (limited to 'keyboards/bastardkb/charybdis')
39 files changed, 111 insertions, 132 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h index ef99f3b631..69e269a963 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h @@ -19,12 +19,6 @@ #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. diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index cbe8ac12e7..c9d7b1bf7f 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "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/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/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h index 909cd05978..484ccc523f 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h @@ -18,17 +18,6 @@ #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 diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index 11cc51ad46..8cbe3d419f 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -3,8 +3,19 @@ "usb": { "device_version": "1.0.0" }, + "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..20b610172d 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 5c56d68554..daa5bfacad 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "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..f09dc72c01 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 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 4b914a775f..34ef6d6e74 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "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" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h index d497261418..bb85468a86 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 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 4b914a775f..daee96bb36 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "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" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 0138b9656f..e01419b97a 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 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index 9e1c778cc3..1153761ca0 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "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/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h index 93d897a4fe..1070dbd066 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { A2, B8, A8, B9 } -#define MATRIX_COL_PINS \ - { B0, B1, B10, B3, B4, B5 } - /* Handedness. */ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 9fa70f3ca1..8287b3112d 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "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/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..a1d7885943 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h @@ -17,17 +17,6 @@ #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 diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 5a8b815e95..9dd366e1dd 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -3,8 +3,19 @@ "usb": { "device_version": "1.0.0" }, + "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..20b610172d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h @@ -17,12 +17,6 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { F7, C6, D4, B5 } -#define MATRIX_COL_PINS \ - { F6, F5, B6, D7, E6, B4 } - /* Handedness. */ #define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index d84a7f314c..d575fdb216 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h index 053d780161..f09dc72c01 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 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 4e1c96298d..e6a3a2318d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "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" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h index e4afc5a866..bb85468a86 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 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 4e1c96298d..d06e372938 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "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" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 658819f936..e01419b97a 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 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index b667f6d76a..99d33fd668 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index e37df487fd..69e269a963 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -19,12 +19,6 @@ #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. diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index ec2b0cbad0..c27515d0fb 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "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/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..484ccc523f 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h @@ -18,17 +18,6 @@ #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 diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index c9921cd341..5dda4a73a5 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -3,8 +3,19 @@ "usb": { "device_version": "1.0.0" }, + "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..20b610172d 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/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 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index 9349712a41..cf70250a15 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "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..f09dc72c01 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 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 6931f9e876..1815ea2b0a 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -3,6 +3,11 @@ "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" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h index 827267d2cf..bb85468a86 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 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 6931f9e876..94f0db8353 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -3,6 +3,11 @@ "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" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index fc4e3efadf..e01419b97a 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 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 0b7ea21560..5f0fd50578 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], + "rows": ["F4", "F7", "C6", "D4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D2" }, |