summary refs log tree commit diff
path: root/keyboards/splitkb
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/splitkb
parent71c22a12db58c71952a12df6bbe445f6f9a4e858 (diff)
Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)
Diffstat (limited to 'keyboards/splitkb')
-rw-r--r--keyboards/splitkb/aurora/corne/rev1/info.json4
-rw-r--r--keyboards/splitkb/aurora/lily58/rev1/info.json4
-rw-r--r--keyboards/splitkb/aurora/sweep/rev1/info.json4
-rw-r--r--keyboards/splitkb/kyria/rev1/config.h4
-rw-r--r--keyboards/splitkb/kyria/rev2/config.h4
-rw-r--r--keyboards/splitkb/kyria/rev3/info.json4
-rw-r--r--keyboards/splitkb/zima/config.h1
-rw-r--r--keyboards/splitkb/zima/info.json3
8 files changed, 19 insertions, 9 deletions
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index 64da285877..2051020895 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -105,12 +105,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 54,
         "split": true,
         "split_count": [27, 27],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index 4c00eedbeb..0341189830 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -116,12 +116,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 68,
         "split": true,
         "split_count": [34, 34],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index dc1cfeea82..d044b243b2 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -108,12 +108,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 46,
         "split": true,
         "split_count": [23, 23],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index dc83cf6b86..3f7655d431 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SERIAL_USART_TX_PIN      D3
 #    define SERIAL_USART_RX_PIN      D2
 
-#    define RGB_DI_PIN               PAL_LINE(GPIOA, 3)
+#    define WS2812_DI_PIN            PAL_LINE(GPIOA, 3)
 #    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
 #    define WS2812_PWM_CHANNEL       4                      // default: 2
 #    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 #else
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define SOFT_SERIAL_PIN D2
 #endif
 
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 8b878739fe..1e8dd02727 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SERIAL_USART_TX_PIN      D3
 #    define SERIAL_USART_RX_PIN      D2
 
-#    define RGB_DI_PIN               PAL_LINE(GPIOA, 3)
+#    define WS2812_DI_PIN            PAL_LINE(GPIOA, 3)
 #    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
 #    define WS2812_PWM_CHANNEL       4                      // default: 2
 #    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 #else
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define SOFT_SERIAL_PIN D2
 #endif
 
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 96bf65847f..57d8d19130 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -174,12 +174,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 62,
         "split": true,
         "split_count": [31, 31],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index c06c192e0d..840cc8e679 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_CLICKY
 #define NO_MUSIC_MODE
 
-#define RGB_DI_PIN         B5
 #define RGBLED_NUM         5
 #define RGBLIGHT_HUE_STEP  8
 #define RGBLIGHT_SAT_STEP  8
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index e73ba2775c..7fd39cf607 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -8,6 +8,9 @@
         "pid": "0xF75B",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "D7", "resolution": 2}