aboutsummaryrefslogtreecommitdiff
path: root/quantum/rgb_matrix/rgb_matrix.c
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-08-17 11:19:00 -0700
committerGitHub <noreply@github.com>2021-08-18 04:19:00 +1000
commit7da97c293da851851c204af065a0c8d2f884effd (patch)
treed1ebbc3898f66b570bf6005bdfffe0682efa8240 /quantum/rgb_matrix/rgb_matrix.c
parent85351dc23d423d1fa5d23aed8b4b478c49949b46 (diff)
downloadqmk_firmware-7da97c293da851851c204af065a0c8d2f884effd.tar.gz
qmk_firmware-7da97c293da851851c204af065a0c8d2f884effd.zip
Rgb matrix/enable modes explicitly (#13758)
* Change animations to require explicet activation * Add support for legacy config * Make default for now * Add LED Matrix support * change LED Matrix docs
Diffstat (limited to 'quantum/rgb_matrix/rgb_matrix.c')
-rw-r--r--quantum/rgb_matrix/rgb_matrix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 624e85158..e5635ee03 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -92,7 +92,7 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv
92#endif 92#endif
93 93
94#if !defined(RGB_MATRIX_STARTUP_MODE) 94#if !defined(RGB_MATRIX_STARTUP_MODE)
95# ifndef DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT 95# ifdef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
96# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT 96# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
97# else 97# else
98// fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace 98// fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace
@@ -243,11 +243,11 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
243 } 243 }
244#endif // RGB_MATRIX_KEYREACTIVE_ENABLED 244#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
245 245
246#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP) 246#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
247 if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) { 247 if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) {
248 process_rgb_matrix_typing_heatmap(row, col); 248 process_rgb_matrix_typing_heatmap(row, col);
249 } 249 }
250#endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP) 250#endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
251} 251}
252 252
253void rgb_matrix_test(void) { 253void rgb_matrix_test(void) {