X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeyboard.c;h=1e3fb510a44d254d01a3b290ac6042764e785552;hb=f31cbc7219c9a1903331771c10056302817e68ca;hp=2206f16759353743c44fa513f77571843afffb8b;hpb=359b68d35f0763ab0cafa2fb800e0a3497291f95;p=max%2Ftmk_keyboard.git
diff --git a/common/keyboard.c b/common/keyboard.c
index 2206f167..1e3fb510 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
#include
-#include
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
@@ -28,11 +27,18 @@ 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
+#ifdef SERIAL_MOUSE_ENABLE
+#include "serial_mouse.h"
#endif
-#include "eeconfig.h"
#ifdef MATRIX_HAS_GHOST
@@ -55,48 +61,23 @@ 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 SERIAL_MOUSE_ENABLE
+ serial_mouse_init();
#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();
-#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 BOOTMAGIC_ENABLE
+ bootmagic();
+#endif
+#ifdef BACKLIGHT_ENABLE
+ backlight_init();
+#endif
}
/*
@@ -125,7 +106,7 @@ void keyboard_task(void)
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & ((matrix_row_t)1<