Remove RGBLIGHT_ANIMATION and clean up effect defines for layouts+use…

…rs (qmk#18729)
freznel10 · Oct 15, 2022 · ad8630b · ad8630b
1 parent f0da486
commit ad8630b
Show file tree

Hide file tree

Showing 28 changed files with 236 additions and 51 deletions.
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
@@ -19,7 +19,16 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #ifndef RGB_DI_PIN
  #define RGB_DI_PIN F4
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
  #define RGBLED_NUM 8 // Number of LEDs
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8

diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h
@@ -2,7 +2,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 15 // Number of LEDs
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 255

diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h
@@ -3,7 +3,16 @@
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 13 // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12

diff --git a/layouts/community/ortho_4x12/bakingpy/config.h b/layouts/community/ortho_4x12/bakingpy/config.h
@@ -8,7 +8,16 @@
 #define TAPPING_TERM 150
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_HUE_STEP 8

diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
@@ -19,7 +19,16 @@
  #define RGBLED_NUM 1
 #endif
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8

diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
@@ -20,8 +20,17 @@
 #if defined(KEYBOARD_fractal)
 # define RGB_DI_PIN D2
 # undef RGBLED_NUM
-# define RGBLIGHT_ANIMATIONS
-# define RGBLED_NUM 29 // Number of LEDs
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLED_NUM 29 // Number of LEDs
 # undef RGBLIGHT_HUE_STEP
 # define RGBLIGHT_HUE_STEP 8
 # undef RGBLIGHT_SAT_STEP

diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
@@ -12,7 +12,16 @@
 #if defined(KEYBOARD_preonic_rev2)
  #define RGB_DI_PIN B3
  #undef RGBLED_NUM
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
  #define RGBLED_NUM 11 // Number of LEDs
  #undef RGBLIGHT_HUE_STEP
  #define RGBLIGHT_HUE_STEP 8

diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h
@@ -4,8 +4,17 @@
 #if defined(KEYBOARD_fractal)
 # define RGB_DI_PIN D2
 # undef RGBLED_NUM
-# define RGBLIGHT_ANIMATIONS
-# define RGBLED_NUM 29 // Number of LEDs
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLED_NUM 29 // Number of LEDs
 # undef RGBLIGHT_HUE_STEP
 # define RGBLIGHT_HUE_STEP 8
 # undef RGBLIGHT_SAT_STEP

diff --git a/layouts/community/tkl_ansi/brandonschlack/config.h b/layouts/community/tkl_ansi/brandonschlack/config.h
@@ -16,5 +16,14 @@
 #pragma once
 
 // Explicit RGB Animation Mode Include
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
diff --git a/users/curry/config.h b/users/curry/config.h
@@ -7,7 +7,13 @@
 #define USB_POLLING_INTERVAL_MS 1
 
 #if defined(RGBLIGHT_ENABLE)
-# undef RGBLIGHT_ANIMATIONS
+# undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+# undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# undef RGBLIGHT_EFFECT_CHRISTMAS
+# undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+# undef RGBLIGHT_EFFECT_RGB_TEST
+# undef RGBLIGHT_EFFECT_ALTERNATING
+# undef RGBLIGHT_EFFECT_TWINKLE
 # define RGBLIGHT_SLEEP
 # define RGBLIGHT_EFFECT_BREATHING
 # define RGBLIGHT_EFFECT_SNAKE

diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
@@ -5,7 +5,16 @@
 
 // because layouts seem to not be respecting config.h order atm
 #ifdef RGBLIGHT_ENABLE
-# undef RGBLIGHT_ANIMATIONS
+# undef RGBLIGHT_EFFECT_BREATHING
+# undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+# undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# undef RGBLIGHT_EFFECT_SNAKE
+# undef RGBLIGHT_EFFECT_KNIGHT
+# undef RGBLIGHT_EFFECT_CHRISTMAS
+# undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+# undef RGBLIGHT_EFFECT_RGB_TEST
+# undef RGBLIGHT_EFFECT_ALTERNATING
+# undef RGBLIGHT_EFFECT_TWINKLE
 # if defined(__AVR__) && (!defined(__AVR_AT90USB1286__) && !defined(RGBLIGHT_ALL_ANIMATIONS))
 # define RGBLIGHT_EFFECT_BREATHING
 # define RGBLIGHT_EFFECT_SNAKE

diff --git a/users/greatwizard/config.h b/users/greatwizard/config.h
@@ -17,7 +17,16 @@
 
 #define TAP_CODE_DELAY 5
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #ifdef TAP_DANCE_ENABLE
 # define TAPPING_TERM 175

diff --git a/users/ishtob/config.h b/users/ishtob/config.h
@@ -25,7 +25,6 @@
 
 /* ws2812 RGB LED
 #define RGB_DI_PIN B5
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 8 // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17

diff --git a/users/kageurufu/rules.mk b/users/kageurufu/rules.mk
@@ -12,4 +12,3 @@ EXTRAKEY_ENABLE = yes
 COMMAND_ENABLE = yes
 CONSOLE_ENABLE = yes
 RGBLIGHT_ENABLE = no
-RGBLIGHT_ANIMATIONS = yes
diff --git a/users/konstantin/config.h b/users/konstantin/config.h
@@ -31,7 +31,16 @@
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 50
 
 // RGB lighting
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
@@ -19,8 +19,17 @@
 #endif // !AUDIO_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-# define RGBLIGHT_SLEEP
-# undef RGBLIGHT_ANIMATIONS
+# undef RGBLIGHT_SLEEP
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 # define RGBLIGHT_HUE_STEP 16
 # define RGBLIGHT_SAT_STEP 16
 # define RGBLIGHT_VAL_STEP 16
@@ -44,12 +53,12 @@
 #if defined(LEADER_ENABLE)
 # define LEADER_PER_KEY_TIMING
 # define LEADER_TIMEOUT 250
-#endif // !LEADER_ENABLE 
+#endif // !LEADER_ENABLE
 
 #if defined(COMBO_ENABLE)
 # define COMBO_COUNT 4
 # define COMBO_TERM 150
-#endif // !COMBO_ENABLE 
+#endif // !COMBO_ENABLE
 
 #if defined(NKRO_ENABLE)
 # define FORCE_NKRO
@@ -82,5 +91,4 @@
 
 #define TAP_CODE_DELAY 5
 
-#define MACRO_TIMER 5 
-
+#define MACRO_TIMER 5
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
@@ -2,7 +2,16 @@
 
 #ifdef RGBLIGHT_ENABLE
  #define RGBLIGHT_SLEEP
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif // RGBLIGHT_ENABLE
 
 #ifdef RGB_MATRIX_ENABLE

diff --git a/users/miles2go/config.h b/users/miles2go/config.h
@@ -2,7 +2,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_SLEEP
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_EFFECT_BREATHING
 #endif // RGBLIGHT_ENABLE
 
@@ -33,11 +42,11 @@
 #define BABL_MODSWAP
 #define BABL_MOVE // Uncomment to add basic cursor movement
 #define BABL_OSKEYS // This adds Cut, paste, window movement and common OS shortcuts
-#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default. 
-// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc. 
+#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default.
+// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc.
 #define BABL_APP // Application specific settings this has sub-options.
 #define BABL_APP_CELLS // spreadsheets and tables
-#define BABL_APP_EDITOR // Fancy editor commands 
+#define BABL_APP_EDITOR // Fancy editor commands
 #define BABL_APP_WINDOWSPLITTING // splitting frames & windows
 
 //All OSes

diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
@@ -14,7 +14,7 @@
 #define RGBLIGHT_COLOR_VI 0x00,0x90,0x00
 #define RGBLIGHT_COLOR_READMUX 0x33,0xFF,0x33 // green screen
 #define RGBLIGHT_COLOR_CHROMEOS 0xf4,0xc2,0xd // google yellows
-#endif 
+#endif
 
 #endif // bablpaste
 
@@ -29,8 +29,17 @@
 #define RGBLIGHT_COLOR_LAYER_2 0xFF, 0x00, 0x00 // symbol
 #define RGBLIGHT_COLOR_LAYER_3 0x00, 0xFF, 0xFF // move
 #define RGBLIGHT_COLOR_LAYER_4 0xFF, 0x00, 0xFF // delmove
-#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_LIGHT_EFFECT_BREATHE_MAX 200
 #define RGBLIGHT_RAINBOW_SWIRL_RANGE 127
 #endif // rgblight

diff --git a/users/mtei/config.h b/users/mtei/config.h
@@ -6,7 +6,6 @@
 #pragma once
 
 // Selection of RGBLIGHT MODE to use.
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
 #undef RGBLIGHT_EFFECT_RAINBOW_MOOD
 #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -16,6 +15,7 @@
 #undef RGBLIGHT_EFFECT_STATIC_GRADIENT
 #undef RGBLIGHT_EFFECT_RGB_TEST
 #undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 
 #if defined(LED_ANIMATIONS)
 # if LED_ANIMATIONS_LEVEL > 1

diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-// # define RGBLIGHT_ANIMATIONS
 # define RGBLIGHT_HUE_STEP 8
 # define RGBLIGHT_SAT_STEP 16
 # define RGBLIGHT_VAL_STEP 16

diff --git a/users/muppetjones/readme/rgblayers.md b/users/muppetjones/readme/rgblayers.md
@@ -14,7 +14,6 @@ This bit of code allows you to define layer lighting that respects your current
 
  ```
  #ifdef RGBLIGHT_ENABLE
- // # define RGBLIGHT_ANIMATIONS
  # define RGBLIGHT_HUE_STEP 8
  # define RGBLIGHT_SAT_STEP 16
  # define RGBLIGHT_VAL_STEP 16