keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qmk/master' into merge-2021-12-11

Browse Source
This commit is contained in:
Ilya Zhuravlev
2021-12-11 20:19:52 -05:00
parent 8b0f74b63d ae34dde677
commit f0ae3fb701
7014 changed files with 165752 additions and 81542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quantum/rgb_matrix/animations/splash_anim.h
View File

@ -1,12 +1,12 @@
#ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
# if !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH)
# if defined(ENABLE_RGB_MATRIX_SPLASH) || defined(ENABLE_RGB_MATRIX_MULTISPLASH)
# ifndef DISABLE_RGB_MATRIX_SPLASH
# ifdef ENABLE_RGB_MATRIX_SPLASH
#define RGB_MATRIX_EFFECT_SPLASH
RGB_MATRIX_EFFECT(SPLASH)
# endif
# ifndef DISABLE_RGB_MATRIX_MULTISPLASH
# ifdef ENABLE_RGB_MATRIX_MULTISPLASH
#define RGB_MATRIX_EFFECT_MULTISPLASH
RGB_MATRIX_EFFECT(MULTISPLASH)
# endif
@ -21,14 +21,14 @@ HSV SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
return hsv;
}
# ifndef DISABLE_RGB_MATRIX_SPLASH
# ifdef ENABLE_RGB_MATRIX_SPLASH
bool SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math); }
# endif
# ifndef DISABLE_RGB_MATRIX_MULTISPLASH
# ifdef ENABLE_RGB_MATRIX_MULTISPLASH
bool MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SPLASH_math); }
# endif
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
# endif // !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH)
# endif // !defined(ENABLE_RGB_MATRIX_SPLASH) || !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
#endif // RGB_MATRIX_KEYREACTIVE_ENABLED