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/solid_reactive_cross.h
View File

@ -1,12 +1,12 @@
#ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
# if !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
# if defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
# ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
#define RGB_MATRIX_EFFECT_SOLID_REACTIVE_CROSS
RGB_MATRIX_EFFECT(SOLID_REACTIVE_CROSS)
# endif
# ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
#define RGB_MATRIX_EFFECT_SOLID_REACTIVE_MULTICROSS
RGB_MATRIX_EFFECT(SOLID_REACTIVE_MULTICROSS)
# endif
@ -25,14 +25,14 @@ static HSV SOLID_REACTIVE_CROSS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
return hsv;
}
# ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); }
# endif
# ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); }
# endif
# endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
# endif // !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || !defined(DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
# endif // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
#endif // RGB_MATRIX_KEYREACTIVE_ENABLED