summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/charybdis/3x6/v2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x6/v2')
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h9
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json8
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h9
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json9
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h9
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json9
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json9
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk1
11 files changed, 35 insertions, 37 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 10:19:14 +0000