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

Remove RGB_DI_PIN ifdefs (qmk#20218)
jpskenn · Nov 4, 2023 · d2a20e1 · d2a20e1
1 parent 33ac854
commit d2a20e1
Show file tree

Hide file tree

Showing 27 changed files with 195 additions and 228 deletions.
diff --git a/keyboards/nora/v01/config.h b/keyboards/nora/v01/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 /* RGBLIGHT */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -37,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LAYERS_RETAIN_VAL // Keeps RGB values between lighting layer changes
   #define RGBLIGHT_ANIMATIONS
   #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* External EEPROM & Dynamic keymap */
 // Use 24LC64 EEPROM

diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json
@@ -10,6 +10,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "ws2812": {
+        "pin": "E6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nora/v01/keymaps/duo/config.h b/keyboards/nora/v01/keymaps/duo/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-// Change LED count.
-// #ifdef RGB_DI_PIN
-//     #undef RGBLED_NUM
-//     #define RGBLED_NUM 4 // Left(2) + Right(2)
-// #endif
-
 #define RGBLIGHT_LAYER_BLINK
 #define RGBLIGHT_MAX_LAYERS 16 // Blinkで2レイヤー追加すると、デフォルトの8レイヤーを超えてしまうため、ここで定義
 

diff --git a/keyboards/nora/v01/keymaps/duo/keymap.c b/keyboards/nora/v01/keymaps/duo/keymap.c
@@ -321,7 +321,7 @@ bool led_update_user(led_t led_state) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
 #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v01/keymaps/jpskenn/config.h b/keyboards/nora/v01/keymaps/jpskenn/config.h
@@ -16,11 +16,5 @@
 
 #pragma once
 
-// Change LED count.
-// #ifdef RGB_DI_PIN
-//     #undef RGBLED_NUM
-//     #define RGBLED_NUM 4 // Left(2) + Right(2)
-// #endif
-
 #define RGBLIGHT_LAYER_BLINK
 #define RGBLIGHT_MAX_LAYERS 10 // Blinkで2レイヤー追加すると、デフォルトの8レイヤーを超えてしまうため、ここで定義
diff --git a/keyboards/nora/v01/keymaps/jpskenn/keymap.c b/keyboards/nora/v01/keymaps/jpskenn/keymap.c
@@ -296,7 +296,7 @@ bool led_update_user(led_t led_state) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
 #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v01/keymaps/via/keymap.c b/keyboards/nora/v01/keymaps/via/keymap.c
@@ -180,7 +180,7 @@ bool led_update_user(led_t led_state) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
   #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v03/config.h b/keyboards/nora/v03/config.h
@@ -23,33 +23,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 /* RGBLIGHT */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
-
-  #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 71
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-    #define RGB_MATRIX_HUE_STEP 8
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 8
-    #define RGB_MATRIX_SPD_STEP 8
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    #define RGB_MATRIX_KEYPRESSES
-
-  #else
-    #define RGBLED_NUM 71
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
-    #define RGBLIGHT_DEFAULT_VAL 127 /* The default brightness level */
-    /* Lighting Layers */
-    #define RGBLIGHT_LAYERS
-    #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-    #define RGBLIGHT_LAYERS_RETAIN_VAL // Keeps RGB values between lighting layer changes
-    #define RGBLIGHT_EFFECT_RGB_TEST
-  #endif
-
+#ifdef RGB_MATRIX_ENABLE
+  #define DRIVER_LED_TOTAL 71
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+  #define RGB_MATRIX_HUE_STEP 8
+  #define RGB_MATRIX_SAT_STEP 8
+  #define RGB_MATRIX_VAL_STEP 8
+  #define RGB_MATRIX_SPD_STEP 8
+  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+  #define RGB_MATRIX_KEYPRESSES
+
+#else
+  #define RGBLED_NUM 71
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
+  #define RGBLIGHT_DEFAULT_VAL 127 /* The default brightness level */
+  /* Lighting Layers */
+  #define RGBLIGHT_LAYERS
+  #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
+  #define RGBLIGHT_LAYERS_RETAIN_VAL // Keeps RGB values between lighting layer changes
+  #define RGBLIGHT_EFFECT_RGB_TEST
 #endif
 
 /* External EEPROM */

diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json
@@ -10,6 +10,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "ws2812": {
+        "pin": "E6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nora/v03/keymaps/jpskenn/config.h b/keyboards/nora/v03/keymaps/jpskenn/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 // Change LED count to actually installed.
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
     #undef RGBLED_NUM
     #define RGBLED_NUM 2
 #endif

diff --git a/keyboards/nora/v03/keymaps/jpskenn/keymap.c b/keyboards/nora/v03/keymaps/jpskenn/keymap.c
@@ -287,7 +287,7 @@ bool led_update_user(led_t led_state) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
 #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v03/keymaps/jpskenn_full/config.h b/keyboards/nora/v03/keymaps/jpskenn_full/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 // Change LED count to actually installed.
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
     #undef RGBLED_NUM
     #define RGBLED_NUM 2
 #endif

diff --git a/keyboards/nora/v03/keymaps/jpskenn_full/keymap.c b/keyboards/nora/v03/keymaps/jpskenn_full/keymap.c
@@ -384,7 +384,7 @@ bool led_update_user(led_t led_state) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
 #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v03/keymaps/jpskenn_full_midi/config.h b/keyboards/nora/v03/keymaps/jpskenn_full_midi/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 // Change LED count to actually installed.
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
     #undef RGBLED_NUM
     #define RGBLED_NUM 2
 #endif

diff --git a/keyboards/nora/v03/keymaps/jpskenn_full_midi/keymap.c b/keyboards/nora/v03/keymaps/jpskenn_full_midi/keymap.c
@@ -384,7 +384,7 @@ bool led_update_user(led_t led_state) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
 #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v03/keymaps/via/keymap.c b/keyboards/nora/v03/keymaps/via/keymap.c
@@ -214,7 +214,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
   #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;

diff --git a/keyboards/nora/v031/config.h b/keyboards/nora/v031/config.h
@@ -49,95 +49,90 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* RGBLIGHT */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
-
-  #ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix */
-
-    // Fireless Wings:      64(default)
-    // FW + Rotary Encoder: 65
-    // Full:                71
-    #define DRIVER_LED_TOTAL 64
-
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-    #define RGB_MATRIX_STARTUP_VAL 40
-    #define RGB_MATRIX_HUE_STEP 4
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 8
-    #define RGB_MATRIX_SPD_STEP 8
-
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-    #define ENABLE_RGB_MATRIX_BREATHING
-    #define ENABLE_RGB_MATRIX_BAND_SAT
-    #define ENABLE_RGB_MATRIX_BAND_VAL
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-    #define ENABLE_RGB_MATRIX_RAINDROPS
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-    #define ENABLE_RGB_MATRIX_HUE_WAVE
-    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
-    #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-    #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-    // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-    #define ENABLE_RGB_MATRIX_SPLASH
-    #define ENABLE_RGB_MATRIX_MULTISPLASH
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-  #endif
-
-  #ifdef RGBLIGHT_ENABLE
-        /* RGB Lighting */
-        #define RGBLED_NUM 64
-
-        #define RGBLIGHT_LIMIT_VAL 128
-        #define RGBLIGHT_DEFAULT_VAL 40
-        #define RGBLIGHT_HUE_STEP 8
-        #define RGBLIGHT_SAT_STEP 8
-        #define RGBLIGHT_VAL_STEP 8
-        /* Lighting Layers */
-        #define RGBLIGHT_LAYERS
-        #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-        #define RGBLIGHT_LAYERS_RETAIN_VAL // Keeps RGB values between lighting layer changes
-        #define RGBLIGHT_MAX_LAYERS 10 // default: 8
-        #define RGBLIGHT_LAYER_BLINK
-        /* Animations & Effects */
-        #define RGBLIGHT_ANIMATIONS
-        #define RGBLIGHT_EFFECT_TWINKLE
-  #endif
+#ifdef RGB_MATRIX_ENABLE
+  /* RGB Matrix */
+
+  // Fireless Wings:      64(default)
+  // FW + Rotary Encoder: 65
+  // Full:                71
+  #define DRIVER_LED_TOTAL 64
+
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
+  #define RGB_MATRIX_STARTUP_VAL 40
+  #define RGB_MATRIX_HUE_STEP 4
+  #define RGB_MATRIX_SAT_STEP 8
+  #define RGB_MATRIX_VAL_STEP 8
+  #define RGB_MATRIX_SPD_STEP 8
+
+  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+  #define RGB_MATRIX_KEYPRESSES
+
+  #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+  #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+  #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+  #define ENABLE_RGB_MATRIX_BREATHING
+  #define ENABLE_RGB_MATRIX_BAND_SAT
+  #define ENABLE_RGB_MATRIX_BAND_VAL
+  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+  #define ENABLE_RGB_MATRIX_CYCLE_ALL
+  #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+  #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+  #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+  #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+  #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+  #define ENABLE_RGB_MATRIX_DUAL_BEACON
+  #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+  #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+  #define ENABLE_RGB_MATRIX_RAINDROPS
+  #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+  #define ENABLE_RGB_MATRIX_HUE_BREATHING
+  #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+  #define ENABLE_RGB_MATRIX_HUE_WAVE
+  #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+  #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+  #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+  // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+  // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+  #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+  // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+  #define ENABLE_RGB_MATRIX_SPLASH
+  #define ENABLE_RGB_MATRIX_MULTISPLASH
+  #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+  #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
 
+#ifdef RGBLIGHT_ENABLE
+      /* RGB Lighting */
+      #define RGBLED_NUM 64
+
+      #define RGBLIGHT_LIMIT_VAL 128
+      #define RGBLIGHT_DEFAULT_VAL 40
+      #define RGBLIGHT_HUE_STEP 8
+      #define RGBLIGHT_SAT_STEP 8
+      #define RGBLIGHT_VAL_STEP 8
+      /* Lighting Layers */
+      #define RGBLIGHT_LAYERS
+      #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
+      #define RGBLIGHT_LAYERS_RETAIN_VAL // Keeps RGB values between lighting layer changes
+      #define RGBLIGHT_MAX_LAYERS 10 // default: 8
+      #define RGBLIGHT_LAYER_BLINK
+      /* Animations & Effects */
+      #define RGBLIGHT_ANIMATIONS
+      #define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 /* External EEPROM */

diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json
@@ -10,6 +10,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "ws2812": {
+        "pin": "E6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [