diff options
author | Albert Y <76888457+filterpaper@users.noreply.github.com> | 2021-11-17 03:14:57 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-16 11:14:57 -0800 |
commit | 557e5ddf99e95eee63f764f6dab05f94fa657c22 (patch) | |
tree | 1cd308acfe6c8d7f4557d6176868156e79b983f3 | |
parent | f817c2e12df21152e85f669b30c7e0c97208ff01 (diff) | |
download | qmk_firmware-557e5ddf99e95eee63f764f6dab05f94fa657c22.tar.gz qmk_firmware-557e5ddf99e95eee63f764f6dab05f94fa657c22.zip |
Rename RGB fractal (#15174)
Co-authored-by: filterpaper <filterpaper@localhost>
-rw-r--r-- | docs/feature_rgb_matrix.md | 4 | ||||
-rw-r--r-- | quantum/rgb_matrix/animations/pixel_fractal_anim.h (renamed from quantum/rgb_matrix/animations/fractal_anim.h) | 8 | ||||
-rw-r--r-- | quantum/rgb_matrix/animations/rgb_matrix_effects.inc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md index 3e1d73de1..d3d740c1b 100644 --- a/docs/feature_rgb_matrix.md +++ b/docs/feature_rgb_matrix.md | |||
@@ -453,7 +453,7 @@ enum rgb_matrix_effects { | |||
453 | RGB_MATRIX_HUE_BREATHING, // Hue shifts up a slight ammount at the same time, then shifts back | 453 | RGB_MATRIX_HUE_BREATHING, // Hue shifts up a slight ammount at the same time, then shifts back |
454 | RGB_MATRIX_HUE_PENDULUM, // Hue shifts up a slight ammount in a wave to the right, then back to the left | 454 | RGB_MATRIX_HUE_PENDULUM, // Hue shifts up a slight ammount in a wave to the right, then back to the left |
455 | RGB_MATRIX_HUE_WAVE, // Hue shifts up a slight ammount and then back down in a wave to the right | 455 | RGB_MATRIX_HUE_WAVE, // Hue shifts up a slight ammount and then back down in a wave to the right |
456 | RGB_MATRIX_FRACTAL, // Single hue fractal filled keys pulsing horizontally out to edges | 456 | RGB_MATRIX_PIXEL_FRACTAL, // Single hue fractal filled keys pulsing horizontally out to edges |
457 | RGB_MATRIX_PIXEL_RAIN, // Randomly light keys with random hues | 457 | RGB_MATRIX_PIXEL_RAIN, // Randomly light keys with random hues |
458 | #if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS) | 458 | #if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS) |
459 | RGB_MATRIX_TYPING_HEATMAP, // How hot is your WPM! | 459 | RGB_MATRIX_TYPING_HEATMAP, // How hot is your WPM! |
@@ -508,7 +508,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi | |||
508 | |`#define ENABLE_RGB_MATRIX_HUE_BREATHING` |Enables `RGB_MATRIX_HUE_BREATHING` | | 508 | |`#define ENABLE_RGB_MATRIX_HUE_BREATHING` |Enables `RGB_MATRIX_HUE_BREATHING` | |
509 | |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM` |Enables `RGB_MATRIX_HUE_PENDULUM` | | 509 | |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM` |Enables `RGB_MATRIX_HUE_PENDULUM` | |
510 | |`#define ENABLE_RGB_MATRIX_HUE_WAVE` |Enables `RGB_MATRIX_HUE_WAVE ` | | 510 | |`#define ENABLE_RGB_MATRIX_HUE_WAVE` |Enables `RGB_MATRIX_HUE_WAVE ` | |
511 | |`#define ENABLE_RGB_MATRIX_FRACTAL` |Enables `RGB_MATRIX_FRACTAL` | | 511 | |`#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL` |Enables `RGB_MATRIX_PIXEL_FRACTAL` | |
512 | |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN` |Enables `RGB_MATRIX_PIXEL_RAIN` | | 512 | |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN` |Enables `RGB_MATRIX_PIXEL_RAIN` | |
513 | 513 | ||
514 | ?> These modes don't require any additional defines. | 514 | ?> These modes don't require any additional defines. |
diff --git a/quantum/rgb_matrix/animations/fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h index 83a69daa6..8e25ec402 100644 --- a/quantum/rgb_matrix/animations/fractal_anim.h +++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h | |||
@@ -16,11 +16,11 @@ | |||
16 | 16 | ||
17 | // Inspired from 4x12 fractal created by @schwarzgrau | 17 | // Inspired from 4x12 fractal created by @schwarzgrau |
18 | 18 | ||
19 | #ifdef ENABLE_RGB_MATRIX_FRACTAL | 19 | #ifdef ENABLE_RGB_MATRIX_PIXEL_FRACTAL |
20 | RGB_MATRIX_EFFECT(FRACTAL) | 20 | RGB_MATRIX_EFFECT(PIXEL_FRACTAL) |
21 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 21 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
22 | 22 | ||
23 | static bool FRACTAL(effect_params_t* params) { | 23 | static bool PIXEL_FRACTAL(effect_params_t* params) { |
24 | # define MID_COL MATRIX_COLS / 2 | 24 | # define MID_COL MATRIX_COLS / 2 |
25 | static bool led[MATRIX_ROWS][MATRIX_COLS]; | 25 | static bool led[MATRIX_ROWS][MATRIX_COLS]; |
26 | 26 | ||
@@ -71,4 +71,4 @@ static bool FRACTAL(effect_params_t* params) { | |||
71 | return false; | 71 | return false; |
72 | } | 72 | } |
73 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 73 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
74 | #endif // ENABLE_RGB_MATRIX_FRACTAL | 74 | #endif // ENABLE_RGB_MATRIX_PIXEL_FRACTAL |
diff --git a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc index 8ecf4367f..27ce34723 100644 --- a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc +++ b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc | |||
@@ -26,8 +26,8 @@ | |||
26 | #include "hue_breathing_anim.h" | 26 | #include "hue_breathing_anim.h" |
27 | #include "hue_pendulum_anim.h" | 27 | #include "hue_pendulum_anim.h" |
28 | #include "hue_wave_anim.h" | 28 | #include "hue_wave_anim.h" |
29 | #include "fractal_anim.h" | ||
30 | #include "pixel_rain_anim.h" | 29 | #include "pixel_rain_anim.h" |
30 | #include "pixel_fractal_anim.h" | ||
31 | #include "typing_heatmap_anim.h" | 31 | #include "typing_heatmap_anim.h" |
32 | #include "digital_rain_anim.h" | 32 | #include "digital_rain_anim.h" |
33 | #include "solid_reactive_simple_anim.h" | 33 | #include "solid_reactive_simple_anim.h" |