summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-06-13 16:06:03 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-06-13 16:06:03 -0400
commitdc9bf78f2b1d7d894576d87ea9bfc86d7bb3deee (patch)
tree44f432118882f9176ef6d901dc3d389d28737254 /tmk_core/common
parentd649ab34334ff568448c47a04fcf40f1aa960135 (diff)
parent25d4772754186b8ab6ef86c28049da67a460f123 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/keyboard.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index bd543c45e1..34e1ceeca5 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -46,6 +46,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ADB_MOUSE_ENABLE
# include "adb.h"
#endif
+#ifdef RGBLIGHT_ENABLE
+# include "rgblight.h"
+#endif
#ifdef MATRIX_HAS_GHOST
static bool is_row_ghosting(uint8_t row){
@@ -89,6 +92,9 @@ void keyboard_init(void) {
#ifdef BACKLIGHT_ENABLE
backlight_init();
#endif
+#ifdef RGBLIGHT_ENABLE
+ rgblight_init();
+#endif
#if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
keyboard_nkro = true;
#endif