Merge branch 'lockkey_fix'(Fix issue #46)

[tmk_firmware.git] / common / keyboard.c

diff --git a/common/keyboard.c b/common/keyboard.c
index 0a0bacd4330dea81d623fed8ceab53906ebcb955..d1821a099f554db950f912f66755aefac2ae2c7a 100644 (file)
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -29,10 +29,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "sendchar.h"
 #include "bootmagic.h"
-#ifdef MOUSEKEY_ENABLE
-#include "mousekey.h"
-#endif
 #include "eeconfig.h"
+#include "mousekey.h"
+#include "backlight.h"
 
 
 #ifdef MATRIX_HAS_GHOST
@@ -56,7 +55,7 @@ static bool has_ghost_in_row(uint8_t row)
 void keyboard_init(void)
 {
     // TODO: configuration of sendchar impl
-    print_sendchar_func = sendchar;
+    print_set_sendchar(sendchar);
 
     timer_init();
     matrix_init();
@@ -64,18 +63,13 @@ void keyboard_init(void)
     ps2_mouse_init();
 #endif
 
+#ifdef BOOTMAGIC_ENABLE
     bootmagic();
+#endif
 
-    if (eeconfig_initialized()) {
-        uint8_t config;
-        config = eeconfig_read_debug();
-        debug_enable = (config & EECONFIG_DEBUG_ENABLE);
-        debug_matrix = (config & EECONFIG_DEBUG_MATRIX);
-        debug_keyboard = (config & EECONFIG_DEBUG_KEYBOARD);
-        debug_mouse = (config & EECONFIG_DEBUG_MOUSE);
-    } else {
-        eeconfig_init();
-    }
+#ifdef BACKLIGHT_ENABLE
+    backlight_init();
+#endif
 }
 
 /*
@@ -133,5 +127,6 @@ MATRIX_LOOP_END:
 
 void keyboard_set_leds(uint8_t leds)
 {
+    if (debug_keyboard) { debug("keyboard_set_led: "); debug_hex8(leds); debug("\n"); }
     led_set(leds);
 }