Migrate rgblight.pin and RGB_DI_PIN to ws2812.pin (#20303)

2023-04-06 18:00:54 +10:00
parent 71c22a12db
commit 47966dc2a6
2600 changed files with 4027 additions and 1909 deletions
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGB_DI_PIN D2
 #define RGBLED_NUM 10
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_HUE_STEP 10
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -8,6 +8,9 @@
      "pid": "0x0037",
      "device_version": "0.0.1"
    },
+    "ws2812": {
+      "pin": "D2"
+    },
    "matrix_pins": {
      "cols": ["B0", "B1", "B2"],
      "rows": ["B3", "B4"]
--- a/keyboards/handwired/alcor_dactyl/config.h
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -25,7 +25,6 @@
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP10
 #define SERIAL_USART_RX_PIN GP9
-#define RGB_DI_PIN GP16
 #define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_SPLIT { 1, 1 }
 #define EE_HANDS
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -34,6 +34,7 @@
        ]
    },
    "ws2812": {
+        "pin": "GP16",
        "driver": "vendor"
    },
    "layouts": {
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE

 /* ws2812 RGB LED */
-#define RGB_DI_PIN C6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -8,6 +8,9 @@
    "pid": "0x040D",
    "device_version": "0.0.1"
  },
+  "ws2812": {
+    "pin": "C6"
+  },
  "matrix_pins": {
    "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
    "rows": ["D3", "D2", "D1", "D0"]
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -16,7 +16,6 @@

 #pragma once

-#define RGB_DI_PIN D3
  #define RGBLED_NUM 4
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -8,6 +8,9 @@
    "pid": "0xDAD3",
    "device_version": "1.0.0"
  },
+  "ws2812": {
+    "pin": "D3"
+  },
  "encoder": {
    "rotary": [
      {"pin_a": "D1", "pin_b": "D0"}
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -42,9 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD

-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 28  // Number of LEDs


--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -16,6 +16,9 @@
    "bootmagic": {
        "matrix": [0, 6]
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "split": {
        "soft_serial_pin": "D0",
        "bootmagic": {
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -23,5 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

-#define RGB_DI_PIN D3
 #define RGBLED_NUM 4
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -17,6 +17,9 @@
        "pin": "B6",
        "levels": 7
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "split": {
        "soft_serial_pin": "D0"
    },
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE

 #define RGBLED_NUM 16
-#define RGB_DI_PIN A7
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM

 #define RGB_MATRIX_KEYPRESSES
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/info.json
@@ -13,6 +13,7 @@
        "breathing": true
    },
    "ws2812": {
+        "pin": "A7",
        "driver": "spi"
    },
    "processor": "STM32F303",
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE

 /* RGB LEDs */
-#define RGB_DI_PIN B1
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -8,6 +8,9 @@
      "pid": "0x0302",
      "device_version": "0.0.1"
    },
+    "ws2812": {
+      "pin": "B1"
+    },
    "matrix_pins": {
      "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
      "rows": ["D0", "D1", "D2", "D3", "D5"]
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -17,7 +17,6 @@
 #pragma once

 /* LEDs are not used in the standard 64key configuration. */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 0

 #define PERMISSIVE_HOLD
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3632",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -16,7 +16,6 @@

 #pragma once

-#define RGB_DI_PIN F4
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3332",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "F4"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
        "rows": ["D1", "D0"]
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -16,7 +16,6 @@

 #pragma once

-#define RGB_DI_PIN F4
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3432",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "F4"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
        "rows": ["D1", "D0"]
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -16,7 +16,6 @@

 #pragma once

-#define RGB_DI_PIN F4
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3433",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "F4"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
        "rows": ["D1", "D0", "F7"]
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -16,7 +16,6 @@

 #pragma once

-#define RGB_DI_PIN F4
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3433",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "F4"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
        "rows": ["D1", "D0", "F7"]
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGB_DI_PIN C4
    #define RGBLED_NUM 42
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6146",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "C4"
+    },
    "matrix_pins": {
        "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"],
        "rows": ["D4", "D5", "D6", "D7"]
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB

-#define RGB_DI_PIN B4
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -9,6 +9,7 @@
        "device_version": "0.0.1"
    },
    "ws2812": {
+        "pin": "B4",
        "driver": "pwm"
    },
    "matrix_pins": {
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -2,7 +2,6 @@

 /* RGB Underglow */
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A15
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "A15"
+    },
    "matrix_pins": {
        "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
        "rows": ["B8", "B9", "B1", "B2", "B4"]
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGB_MATRIX_LED_COUNT 36
 #define RGB_MATRIX_SPLIT { 18, 18 }
 #define RGB_MATRIX_CENTER { 133, 54 }
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3536",
        "device_version": "0.0.3"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["C6", "D7", "E6", "B4", "B5"],
        "rows": ["B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3435",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["C6", "D7", "E6", "B4", "B5"],
        "rows": ["F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3436",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
@@ -9,9 +9,9 @@
 #define SPLIT_HAND_PIN F6

 // WS2812 RGB LED strip input and number of LEDs
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLED_NUM 52
 #define RGBLED_SPLIT {26, 26}
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
@@ -7,7 +7,7 @@
 #define USE_I2C
 #define SPLIT_HAND_PIN F6

-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM

 #define DEBOUNCE 5
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3436",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3536",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_MAX_SPEED   	3

 // RGB backlight
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLED_NUM 30
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 // Rows are doubled-up

-#undef RGB_DI_PIN
-#define RGB_DI_PIN F5
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN F5

 #undef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D0
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3537",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
@@ -17,5 +17,4 @@
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -7,6 +7,9 @@
    "split": {
        "soft_serial_pin": "D0"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"],
        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -5,6 +5,5 @@
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 #define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 6           // Used when chaining strips
 #define RGBLED_SPLIT { 3, 3 }  // Used when not chaining strips
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,9 @@
        "pid": "0x3632",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D1"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -33,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD

-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs

 /*
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/info.json
@@ -16,6 +16,9 @@
    "split": {
        "soft_serial_pin": "D0"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS

 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #if !defined(RGBLED_NUM)
 #    define RGBLED_NUM 30
 #    define RGBLIGHT_SPLIT
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -16,6 +16,9 @@
 "split": {
    "soft_serial_pin": "D0"
 },
+"ws2812": {
+    "pin": "D4"
+},
 "processor": "atmega32u4",
 "bootloader": "caterina",
 "debounce": 3,
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGB_DI_PIN D4
 	#define RGBLED_NUM 6
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "ws2812": {
+    "pin": "D4"
+  },
  "matrix_pins": {
    "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
    "rows": ["D3", "D2", "D1", "D0"]
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 30
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -23,6 +23,9 @@
        "levels": 4,
        "breathing": true
    },
+    "ws2812": {
+        "pin": "E2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 50
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "E2"
+    },
    "matrix_pins": {
        "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
        "rows": ["B7", "D7", "F1", "F0"]
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -9,7 +9,6 @@
 #define NO_ACTION_ONESHOT
 #define TAPPING_TOGGLE 3

-#define RGB_DI_PIN F4
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 1
 #define RGBLIGHT_SAT_STEP 1
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -8,6 +8,9 @@
    "pid": "0x1000",
    "device_version": "0.0.1"
  },
+  "ws2812": {
+    "pin": "F4"
+  },
  "matrix_pins": {
    "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"],
    "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"]
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,9 +2,6 @@

 #pragma once

-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 9    // Number of LEDs

 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -16,6 +16,9 @@
    "backlight": {
        "breathing_period": 2
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGB_DI_PIN B9
 #define WS2812_PWM_DRIVER   PWMD4
 #define WS2812_PWM_CHANNEL  4
 #define WS2812_PWM_PAL_MODE 2
--- a/keyboards/handwired/macroboard/info.json
+++ b/keyboards/handwired/macroboard/info.json
@@ -8,6 +8,9 @@
        "pid": "0x2137",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "B9"
+    },
    "layouts": {
        "LAYOUT_ortho_5x6": {
            "layout": [
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -18,7 +18,6 @@

 #define LAYER_STATE_8BIT

-#define RGB_DI_PIN D3
    #define RGBLED_NUM 7
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D3"
+    },
    "matrix_pins": {
        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"],
        "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"]
--- a/keyboards/handwired/minorca/keymaps/rgb/config.h
+++ b/keyboards/handwired/minorca/keymaps/rgb/config.h
@@ -1,7 +1,7 @@
 #pragma once

 /* ws2812 RGB LED */
-#define RGB_DI_PIN D5
+#define WS2812_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/info.json
@@ -8,7 +8,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/info.json
@@ -8,7 +8,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/bluepill/info.json
+++ b/keyboards/handwired/onekey/bluepill/info.json
@@ -8,7 +8,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "A0"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A1"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/elite_c/info.json
+++ b/keyboards/handwired/onekey/elite_c/info.json
@@ -8,7 +8,7 @@
    "backlight": {
        "pin": "B6"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "F6"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "B8"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A0"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "B8"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A0"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ b/keyboards/handwired/onekey/kb2040/info.json
@@ -5,10 +5,8 @@
        "cols": ["GP4"],
        "rows": ["GP5"]
    },
-    "rgblight": {
-        "pin": "GP17"
-    },
    "ws2812": {
+        "pin": "GP17",
        "driver": "vendor"
    }
 }
--- a/keyboards/handwired/onekey/nucleo_f446re/info.json
+++ b/keyboards/handwired/onekey/nucleo_f446re/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "B8"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A0"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/nucleo_l432kc/info.json
+++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "B8"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A0"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/promicro/info.json
+++ b/keyboards/handwired/onekey/promicro/info.json
@@ -8,7 +8,7 @@
    "backlight": {
        "pin": "B6"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "F6"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/proton_c/info.json
+++ b/keyboards/handwired/onekey/proton_c/info.json
@@ -8,7 +8,7 @@
    "backlight": {
        "pin": "B8"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A0"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "GP25"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "GP25"
    }
 }
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
@@ -10,7 +10,7 @@
    "backlight": {
        "pin": "A1"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "A2"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/stm32f0_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f0_disco/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "C8"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "B15"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/teensy_2/info.json
+++ b/keyboards/handwired/onekey/teensy_2/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "B6"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "F6"
    },
    "apa102": {
--- a/keyboards/handwired/onekey/teensy_2pp/info.json
+++ b/keyboards/handwired/onekey/teensy_2pp/info.json
@@ -9,7 +9,7 @@
    "backlight": {
        "pin": "B6"
    },
-    "rgblight": {
+    "ws2812": {
        "pin": "F6"
    },
    "apa102": {
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

-#define RGB_DI_PIN D0
  #define RGBLED_NUM 8
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/info.json
@@ -8,6 +8,9 @@
        "pid": "0xDA19",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "D0"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "debounce": 9,
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGB_DI_PIN B4
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
--- a/Show More
+++ b/Show More