aboutsummaryrefslogtreecommitdiff
path: root/quantum/rgb_matrix.c
diff options
context:
space:
mode:
authorM-AS <matthewtransformer@hotmail.com>2019-04-22 11:37:40 -0400
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-04-22 08:37:40 -0700
commitbb52119a6dfe9c6f0314d1bcd948efda59626a70 (patch)
treea385f30d3eee0bf585e1089f0907c24fa64523dc /quantum/rgb_matrix.c
parentb61baf4281bde34bfe28aaa1109bd5d5c6471116 (diff)
downloadqmk_firmware-bb52119a6dfe9c6f0314d1bcd948efda59626a70.tar.gz
qmk_firmware-bb52119a6dfe9c6f0314d1bcd948efda59626a70.zip
RGB Matrix Animations: Three/six new reactive effects (wide, cross, nexus) (#5602)
* added 3 new RGB_Matrix effects * made cross effect behavior smoother * removed dead code * added effect descriptions
Diffstat (limited to 'quantum/rgb_matrix.c')
-rw-r--r--quantum/rgb_matrix.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c
index a1193d4c0..41ed8983e 100644
--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -41,6 +41,9 @@
41#include "rgb_matrix_animations/digital_rain_anim.h" 41#include "rgb_matrix_animations/digital_rain_anim.h"
42#include "rgb_matrix_animations/solid_reactive_simple_anim.h" 42#include "rgb_matrix_animations/solid_reactive_simple_anim.h"
43#include "rgb_matrix_animations/solid_reactive_anim.h" 43#include "rgb_matrix_animations/solid_reactive_anim.h"
44#include "rgb_matrix_animations/solid_reactive_wide.h"
45#include "rgb_matrix_animations/solid_reactive_cross.h"
46#include "rgb_matrix_animations/solid_reactive_nexus.h"
44#include "rgb_matrix_animations/splash_anim.h" 47#include "rgb_matrix_animations/splash_anim.h"
45#include "rgb_matrix_animations/solid_splash_anim.h" 48#include "rgb_matrix_animations/solid_splash_anim.h"
46#include "rgb_matrix_animations/breathing_anim.h" 49#include "rgb_matrix_animations/breathing_anim.h"
@@ -380,6 +383,36 @@ static void rgb_task_render(uint8_t effect) {
380 rendering = rgb_matrix_solid_reactive(&rgb_effect_params); // Max 4ms Avg 3ms 383 rendering = rgb_matrix_solid_reactive(&rgb_effect_params); // Max 4ms Avg 3ms
381 break; 384 break;
382#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE 385#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE
386#ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
387 case RGB_MATRIX_SOLID_REACTIVE_WIDE:
388 rendering = rgb_matrix_solid_reactive_wide(&rgb_effect_params); // Max ?? ms Avg ?? ms
389 break;
390#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
391#ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
392 case RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE:
393 rendering = rgb_matrix_solid_reactive_multiwide(&rgb_effect_params); // Max ?? ms Avg ?? ms
394 break;
395#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
396#ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
397 case RGB_MATRIX_SOLID_REACTIVE_CROSS:
398 rendering = rgb_matrix_solid_reactive_cross(&rgb_effect_params); // Max ?? ms Avg ?? ms
399 break;
400#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
401#ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
402 case RGB_MATRIX_SOLID_REACTIVE_MULTICROSS:
403 rendering = rgb_matrix_solid_reactive_multicross(&rgb_effect_params); // Max ?? ms Avg ?? ms
404 break;
405#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
406#ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
407 case RGB_MATRIX_SOLID_REACTIVE_NEXUS:
408 rendering = rgb_matrix_solid_reactive_nexus(&rgb_effect_params); // Max ?? ms Avg ?? ms
409 break;
410#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
411#ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
412 case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
413 rendering = rgb_matrix_solid_reactive_multinexus(&rgb_effect_params); // Max ?? ms Avg ?? ms
414 break;
415#endif // DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
383#ifndef DISABLE_RGB_MATRIX_SPLASH 416#ifndef DISABLE_RGB_MATRIX_SPLASH
384 case RGB_MATRIX_SPLASH: 417 case RGB_MATRIX_SPLASH:
385 rendering = rgb_matrix_splash(&rgb_effect_params); // Max 5ms Avg 3ms 418 rendering = rgb_matrix_splash(&rgb_effect_params); // Max 5ms Avg 3ms