X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeyboard.c;h=2b66f20a013e4c0389d74b422d00c870b41336ab;hb=9fdb02017b8419f81fb363cbb3ced81446db0a4c;hp=2206f16759353743c44fa513f77571843afffb8b;hpb=359b68d35f0763ab0cafa2fb800e0a3497291f95;p=max%2Ftmk_keyboard.git diff --git a/common/keyboard.c b/common/keyboard.c index 2206f167..2b66f20a 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -28,11 +28,15 @@ along with this program. If not, see . #include "command.h" #include "util.h" #include "sendchar.h" -#include "bootloader.h" +#include "bootmagic.h" +#include "eeconfig.h" +#include "backlight.h" #ifdef MOUSEKEY_ENABLE -#include "mousekey.h" +# include "mousekey.h" +#endif +#ifdef PS2_MOUSE_ENABLE +# include "ps2_mouse.h" #endif -#include "eeconfig.h" #ifdef MATRIX_HAS_GHOST @@ -55,48 +59,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 - /* matrix scan for boot magic keys */ -#ifdef DEBOUNCE - uint8_t scan = DEBOUNCE * 2; - while (scan--) { matrix_scan(); _delay_ms(1); } -#else - matrix_scan(); +#ifdef BOOTMAGIC_ENABLE + bootmagic(); #endif - /* boot magic keys */ -#ifdef IS_BOOTMAGIC_BOOTLOADER - /* kick up bootloader */ - if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump(); -#endif -#ifdef IS_BOOTMAGIC_DEBUG - if (IS_BOOTMAGIC_DEBUG()) { - eeconfig_write_debug(eeconfig_read_debug() ^ EECONFIG_DEBUG_ENABLE); - } -#endif -#ifdef IS_BOOTMAGIC_EEPROM_CLEAR - if (IS_BOOTMAGIC_EEPROM_CLEAR()) eeconfig_init(); +#ifdef BACKLIGHT_ENABLE + backlight_init(); #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(); - } - } /* @@ -141,10 +116,16 @@ void keyboard_task(void) action_exec(TICK); MATRIX_LOOP_END: + #ifdef MOUSEKEY_ENABLE // mousekey repeat & acceleration mousekey_task(); #endif + +#ifdef PS2_MOUSE_ENABLE + ps2_mouse_task(); +#endif + // update LED if (led_status != host_keyboard_leds()) { led_status = host_keyboard_leds(); @@ -154,5 +135,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); }