Migrate RGB_DI_PIN to ws2812.pin, E

qmk · fauxpark · Apr 6, 2023 · Mar 30, 2023 · Mar 30, 2023 · Mar 30, 2023
commit ec9c095c1f20d4c44b9d1cb388177b02b5c86858
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN C7
    #define RGBLED_NUM 7
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8

diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "D5", "pin_b": "F1"}
         ]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x14"],

diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
@@ -13,7 +13,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5

diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "ws2812": {
+        "pin": "B15",
         "driver": "spi"
     },
     "matrix_pins": {

diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
@@ -16,6 +16,9 @@
     "indicators": {
         "caps_lock": "F6"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {

diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
 
 /* Underglow */
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 17
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2

diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "ws2812": {
+        "pin": "B3",
         "driver": "pwm"
     },
     "matrix_pins": {

diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
@@ -17,4 +17,3 @@
 
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN C6
diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json
@@ -13,6 +13,9 @@
         "rows": ["D4", "D6", "D7", "F7"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
  * Enable RGB Underlighting
  */
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 15
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
@@ -11,6 +11,9 @@
         "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* RGB Underglow */
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 32
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
@@ -14,6 +14,9 @@
         "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "A10"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["ortho_4x16"],

diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
@@ -10,7 +10,6 @@
 /*
  * Enable RGB Underlighting
  */
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
@@ -13,6 +13,9 @@
         "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/edinburgh41/config.h b/keyboards/edinburgh41/config.h
@@ -5,7 +5,6 @@
 
 // Underglow LED settings
 
-#define RGB_DI_PIN D0
 #define RGBLED_NUM 10
 
 // Thumbstick settings

diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
@@ -10,6 +10,9 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "matrix_pins": {
         "cols": ["D1", "D4", "C6", "D7", "E6", "B4"],
         "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]

diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
- #define RGB_DI_PIN D3
   #define RGBLED_NUM 36
   #define RGBLIGHT_HUE_STEP 4
   #define RGBLIGHT_SAT_STEP 8

diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
@@ -13,6 +13,9 @@
         "rows": ["D7", "E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["split_3x5_3"],

diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define AUDIO_DAC_SAMPLE_MAX 4095U
 #endif
 
-#define RGB_DI_PIN E7
 #    define RGBLED_NUM         38
 #    define RGBLIGHT_HUE_STEP  4
 #    define RGBLIGHT_SAT_STEP  8

diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
@@ -19,6 +19,9 @@
             {"pin_a": "C5", "pin_b": "C4"}
         ]
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "qmk-dfu",
     "layouts": {

diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D3
 #    define RGBLED_SPLIT { 27, 27 }
 #    define RGBLED_NUM 54 // backlight x42 + underglow x12
 #    define RGBLIGHT_HUE_STEP 8

diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json
@@ -12,6 +12,9 @@
         "rows": ["F4", "F5", "F6", "F7", "D2"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
@@ -69,7 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI)
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
@@ -6,6 +6,9 @@
         "vid": "0x3297",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "debounce": 30,

diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 2    // Number of LEDs
 // FIXME this following line should enable our layer status LEDs to work on both
 // sides without need to wire them into a chain. It doesn't though. Uncommenting

diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {

diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*

diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "bootloader": "caterina",
   "processor": "atmega32u4",
   "layouts": {

diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 51
 #define RGBLIGHT_HUE_STEP 20
 #define RGBLIGHT_SAT_STEP 17

diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json
@@ -13,6 +13,9 @@
         "rows": ["A9", "A8", "A3", "A5"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {

diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 51
 #define RGBLIGHT_HUE_STEP 20
 #define RGBLIGHT_SAT_STEP 17

diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json
@@ -13,6 +13,9 @@
         "rows": ["A9", "A8", "A3", "A5"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F042",
     "bootloader": "stm32-dfu",
     "layouts": {

diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 8
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING

diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
@@ -16,6 +16,9 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP

diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B3", "pin_b": "A15", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {

diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
@@ -22,5 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D0    // The pin the LED strip is connected to
 #define RGBLED_NUM 1     // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
@@ -18,6 +18,9 @@
         "levels": 4,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B7",
         "esc_output": "D7",

diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN F5    // The pin the LED strip is connected to
 #define RGBLED_NUM 6     // Number of LEDs in your strip
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
@@ -18,6 +18,9 @@
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F5"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B0",
         "esc_output": "B7",

diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
- #define RGB_DI_PIN E6
    #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD