summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2020-07-27 03:50:49 -0700
committerDrashna Jael're <drashna@live.com>2020-07-27 03:50:49 -0700
commit060a3190076769d1ada8e06249bd75f291d2f307 (patch)
tree0c890d52c7ce96fbc2bbcffb3ba6a83f94a72dbb
parentfa51e2b5c3b386344abda29432bb9fbea01ff1ce (diff)
Init RGB Matrix laterfix/rgb_matrix_init
-rw-r--r--quantum/quantum.c3
-rw-r--r--tmk_core/common/keyboard.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index af275bb2da..03d40bf1b0 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -628,9 +628,6 @@ void matrix_init_quantum() {
#ifdef AUDIO_ENABLE
audio_init();
#endif
-#ifdef RGB_MATRIX_ENABLE
- rgb_matrix_init();
-#endif
#ifdef ENCODER_ENABLE
encoder_init();
#endif
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index c030da8130..92607b5ce8 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -86,6 +86,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef VIA_ENABLE
# include "via.h"
#endif
+#ifdef RGB_MATRIX_ENABLE
+# include "rgb_matrix.h"
+#endif
// Only enable this if console is enabled to print to
#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
@@ -251,6 +254,9 @@ void keyboard_init(void) {
#ifdef RGBLIGHT_ENABLE
rgblight_init();
#endif
+#ifdef RGB_MATRIX_ENABLE
+ rgb_matrix_init();
+#endif
#ifdef STENO_ENABLE
steno_init();
#endif