X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeyboard.c;h=601e3abe17b6d06774d76e9e8b79d32c3993e76d;hb=e93188021c0b1578ffbb6e0fadcd94e1e5132dcf;hp=1acb79861da04bb76d70702f0f8fbdc672115c81;hpb=d055e0633e36e97802d60554f6002e47021ba5fd;p=max%2Ftmk_keyboard.git diff --git a/common/keyboard.c b/common/keyboard.c index 1acb7986..601e3abe 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -29,10 +29,9 @@ along with this program. If not, see . #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 @@ -55,28 +54,19 @@ static bool has_ghost_in_row(uint8_t row) void keyboard_init(void) { - // TODO: configuration of sendchar impl - print_sendchar_func = sendchar; - timer_init(); matrix_init(); #ifdef PS2_MOUSE_ENABLE ps2_mouse_init(); #endif +#ifdef BOOTMAGIC_ENABLE bootmagic(); +#endif - if (eeconfig_is_enabled()) { - uint8_t config; - config = eeconfig_read_debug(); - // ignored if debug is enabled by program before. - if (!debug_enable) debug_enable = (config & EECONFIG_DEBUG_ENABLE); - if (!debug_matrix) debug_matrix = (config & EECONFIG_DEBUG_MATRIX); - if (!debug_keyboard) debug_keyboard = (config & EECONFIG_DEBUG_KEYBOARD); - if (!debug_mouse) debug_mouse = (config & EECONFIG_DEBUG_MOUSE); - } else { - eeconfig_init(); - } +#ifdef BACKLIGHT_ENABLE + backlight_init(); +#endif } /* @@ -134,5 +124,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); }