aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLenbok <lenbok@gmail.com>2019-04-06 13:19:42 +1300
committerDrashna Jaelre <drashna@live.com>2019-04-06 10:59:25 -0700
commit2ffa4798a43682a73598c0b43d46abcca7cd6e83 (patch)
tree9c347a42bc2cef2b3e73ce015a0290af6a7469a2
parentcb33643f0209202e5d195613ad685e3cdae4ef2d (diff)
downloadqmk_firmware-2ffa4798a43682a73598c0b43d46abcca7cd6e83.tar.gz
qmk_firmware-2ffa4798a43682a73598c0b43d46abcca7cd6e83.zip
Fix bugs that cause compile failures when enabling only some animations.
-rw-r--r--quantum/rgb_matrix.c2
-rw-r--r--quantum/rgb_matrix_animations/breathing_anim.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c
index 413e5777f..a1193d4c0 100644
--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -101,7 +101,7 @@ void eeconfig_update_rgb_matrix(uint32_t val) {
101void eeconfig_update_rgb_matrix_default(void) { 101void eeconfig_update_rgb_matrix_default(void) {
102 dprintf("eeconfig_update_rgb_matrix_default\n"); 102 dprintf("eeconfig_update_rgb_matrix_default\n");
103 rgb_matrix_config.enable = 1; 103 rgb_matrix_config.enable = 1;
104#ifndef DISABLE_RGB_MATRIX_CYCLE_ALL 104#ifndef DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
105 rgb_matrix_config.mode = RGB_MATRIX_CYCLE_LEFT_RIGHT; 105 rgb_matrix_config.mode = RGB_MATRIX_CYCLE_LEFT_RIGHT;
106#else 106#else
107 // fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace 107 // fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace
diff --git a/quantum/rgb_matrix_animations/breathing_anim.h b/quantum/rgb_matrix_animations/breathing_anim.h
index fb90b66bd..4a9a1dcdb 100644
--- a/quantum/rgb_matrix_animations/breathing_anim.h
+++ b/quantum/rgb_matrix_animations/breathing_anim.h
@@ -1,6 +1,7 @@
1#pragma once 1#pragma once
2#ifndef DISABLE_RGB_MATRIX_BREATHING 2#ifndef DISABLE_RGB_MATRIX_BREATHING
3 3
4extern rgb_counters_t g_rgb_counters;
4extern rgb_config_t rgb_matrix_config; 5extern rgb_config_t rgb_matrix_config;
5 6
6bool rgb_matrix_breathing(effect_params_t* params) { 7bool rgb_matrix_breathing(effect_params_t* params) {