summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/scylla/v2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/scylla/v2')
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/config.h9
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/info.json11
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/config.h9
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/info.json12
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/rules.mk2
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/config.h9
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/info.json12
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/rules.mk2
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/config.h7
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/info.json12
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/rules.mk2
12 files changed, 47 insertions, 41 deletions
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
index e9691010ed..e6b7fefa66 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v2/elitec/config.h
@@ -17,14 +17,5 @@
#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
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 4674e238a6..1a8643b27d 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -3,6 +3,17 @@
"usb": {
"device_version": "2.0.0"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "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/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index f65dcfb0b3..977fb0a6e8 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/scylla/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
-
/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 6d3edbd0ee..8ba2d4d19a 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
"usb": {
"device_version": "2.0.0"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "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/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index 09d5af43c8..e496023656 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/scylla/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
-
/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 6d3edbd0ee..c0cd88672b 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
"usb": {
"device_version": "2.0.0"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "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/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 5528531b91..0bbfd39aee 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ b/keyboards/bastardkb/scylla/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/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index eccfea99f4..2c66f25554 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -3,6 +3,18 @@
"usb": {
"device_version": "2.0.0"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "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/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 70f7784de6..c42b71866e 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -17,11 +17,9 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
DEBOUNCE_TYPE = asym_eager_defer_pk