From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 6 Apr 2023 18:00:54 +1000
Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)

---
 keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h     | 3 ---
 keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json    | 3 +++
 keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h  | 3 ---
 keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json | 1 +
 keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h  | 3 ---
 keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json | 1 +
 keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h   | 1 -
 keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json  | 1 +
 8 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'keyboards/bastardkb/charybdis/3x6/v2')

diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
index 20b610172d..3b91322247 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index d575fdb216..e3aa2ae1bf 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
index f09dc72c01..e6e2a4f216 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 6e06faa9a8..4fd92418b3 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
index bb85468a86..ee7745d41e 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 8ac1338634..7dc1bcc85f 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index e01419b97a..6aa20712f6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 8f89d16fbe..33f416b49d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -4,6 +4,7 @@
         "device_version": "2.0.0"
     },
     "ws2812": {
+        "pin": "D3",
         "driver": "pwm"
     },
     "matrix_pins": {
-- 
cgit v1.2.3