summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/charybdis/3x5
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-06 18:00:54 +1000
committerGitHub <noreply@github.com>2023-04-06 18:00:54 +1000
commit47966dc2a65c88ac90fcd64d12243d72f3f6753b (patch)
treed2f54974c74f66bf11565a64381ea8834f49d481 /keyboards/bastardkb/charybdis/3x5
parent71c22a12db58c71952a12df6bbe445f6f9a4e858 (diff)
Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x5')
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/config.h1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/info.json1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json1
13 files changed, 12 insertions, 16 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
index 69e269a963..68901305c4 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
@@ -23,7 +23,6 @@
#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 920616b45b..fec474f14d 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -4,6 +4,7 @@
"device_version": "1.0.0"
},
"ws2812": {
+ "pin": "A1",
"driver": "pwm"
},
"matrix_pins": {
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/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
index 484ccc523f..dc0c6e4e03 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
@@ -21,8 +21,5 @@
/* 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 8cbe3d419f..ec56b88c02 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"matrix_pins": {
"cols": ["C7", "F0", "D7", "E6", "B4"],
"rows": ["B7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
index 20b610172d..3b91322247 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
@@ -20,8 +20,5 @@
/* 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 daa5bfacad..a318e467df 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "2.0.0"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"matrix_pins": {
"cols": ["F5", "B6", "D7", "E6", "B4"],
"rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
index f09dc72c01..e6e2a4f216 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
@@ -25,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 09dfc95916..100b53fc61 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
"soft_serial_pin": "GP1"
},
"ws2812": {
+ "pin": "GP0",
"driver": "vendor"
},
"processor": "RP2040",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
index bb85468a86..ee7745d41e 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
@@ -25,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 8eb16af2f0..841975db3d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
"soft_serial_pin": "GP1"
},
"ws2812": {
+ "pin": "GP0",
"driver": "vendor"
},
"processor": "RP2040",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
index e01419b97a..6aa20712f6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
@@ -27,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 1e12af668b..465f54b42e 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -4,6 +4,7 @@
"device_version": "2.0.0"
},
"ws2812": {
+ "pin": "D3",
"driver": "pwm"
},
"matrix_pins": {