X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fkeyboard.c;h=371d93f3e59b755130b5afdb7fc8428e879d8bf9;hb=4b682ea63e2b3dd0bc1132917be7985ce0da57a6;hp=b03b124d76a98af7bc41e32aa4a09b055c8bf392;hpb=7780fd1c01182ab67d899b78d85a0d3b0d89196f;p=qmk_firmware.git

diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index b03b124d7..371d93f3e 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
+Copyright 2011, 2012, 2013 Jun Wako <wakojun@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,9 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "command.h"
 #include "util.h"
 #include "sendchar.h"
-#include "bootmagic.h"
 #include "eeconfig.h"
 #include "backlight.h"
+#include "action_layer.h"
+#ifdef BOOTMAGIC_ENABLE
+#   include "bootmagic.h"
+#else
+#   include "magic.h"
+#endif
 #ifdef MOUSEKEY_ENABLE
 #   include "mousekey.h"
 #endif
@@ -37,13 +42,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   include "ps2_mouse.h"
 #endif
 #ifdef SERIAL_MOUSE_ENABLE
-#include "serial_mouse.h"
+#   include "serial_mouse.h"
 #endif
 #ifdef ADB_MOUSE_ENABLE
-#include "adb.h"
+#   include "adb.h"
+#endif
+#ifdef RGBLIGHT_ENABLE
+#   include "rgblight.h"
+#endif
+#ifdef SERIAL_LINK_ENABLE
+#   include "serial_link/system/serial_link.h"
+#endif
+#ifdef VISUALIZER_ENABLE
+#   include "visualizer/visualizer.h"
 #endif
 
 
+
 #ifdef MATRIX_HAS_GHOST
 static bool has_ghost_in_row(uint8_t row)
 {
@@ -61,9 +76,15 @@ static bool has_ghost_in_row(uint8_t row)
 }
 #endif
 
+__attribute__ ((weak))
+void matrix_setup(void) {
+}
 
-void keyboard_init(void)
-{
+void keyboard_setup(void) {
+    matrix_setup();
+}
+
+void keyboard_init(void) {
     timer_init();
     matrix_init();
 #ifdef PS2_MOUSE_ENABLE
@@ -75,15 +96,20 @@ void keyboard_init(void)
 #ifdef ADB_MOUSE_ENABLE
     adb_mouse_init();
 #endif
-
-
 #ifdef BOOTMAGIC_ENABLE
     bootmagic();
+#else
+    magic();
 #endif
-
 #ifdef BACKLIGHT_ENABLE
     backlight_init();
 #endif
+#ifdef RGBLIGHT_ENABLE
+    rgblight_init();
+#endif
+#if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
+    keymap_config.nkro = 1;
+#endif
 }
 
 /*
@@ -150,11 +176,19 @@ MATRIX_LOOP_END:
 #endif
 
 #ifdef SERIAL_MOUSE_ENABLE
-        serial_mouse_task();
+    serial_mouse_task();
 #endif
 
 #ifdef ADB_MOUSE_ENABLE
-        adb_mouse_task();
+    adb_mouse_task();
+#endif
+
+#ifdef SERIAL_LINK_ENABLE
+	serial_link_update();
+#endif
+
+#ifdef VISUALIZER_ENABLE
+    visualizer_update(default_layer_state, layer_state, host_keyboard_leds());
 #endif
 
     // update LED