X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fkeyboard.c;h=2302acb7910ffda5c4d686c796ed09b459165919;hb=4e83400fc6f67a0559cf343ba5846b505c35fd30;hp=f0ead604eccb87567c4984a67adf2bb7efa10434;hpb=a3d96d3aa96318d339a67de1085e0ae495d57c84;p=max%2Ftmk_keyboard.git
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index f0ead604..2302acb7 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -30,6 +30,7 @@ along with this program. If not, see .
#include "bootmagic.h"
#include "eeconfig.h"
#include "backlight.h"
+#include "hook.h"
#ifdef MOUSEKEY_ENABLE
# include "mousekey.h"
#endif
@@ -39,6 +40,9 @@ along with this program. If not, see .
#ifdef SERIAL_MOUSE_ENABLE
#include "serial_mouse.h"
#endif
+#ifdef ADB_MOUSE_ENABLE
+#include "adb.h"
+#endif
#ifdef MATRIX_HAS_GHOST
@@ -59,6 +63,11 @@ static bool has_ghost_in_row(uint8_t row)
#endif
+void keyboard_setup(void)
+{
+ matrix_setup();
+}
+
void keyboard_init(void)
{
timer_init();
@@ -69,6 +78,9 @@ void keyboard_init(void)
#ifdef SERIAL_MOUSE_ENABLE
serial_mouse_init();
#endif
+#ifdef ADB_MOUSE_ENABLE
+ adb_mouse_init();
+#endif
#ifdef BOOTMAGIC_ENABLE
@@ -81,7 +93,7 @@ void keyboard_init(void)
}
/*
- * Do keyboard routine jobs: scan mantrix, light LEDs, ...
+ * Do keyboard routine jobs: scan matrix, light LEDs, ...
* This is repeatedly called as fast as possible.
*/
void keyboard_task(void)
@@ -114,17 +126,22 @@ void keyboard_task(void)
matrix_ghost[r] = matrix_row;
#endif
if (debug_matrix) matrix_print();
- for (uint8_t c = 0; c < MATRIX_COLS; c++) {
- if (matrix_change & ((matrix_row_t)1<