X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fkeyboard.c;h=6057ea13fbc3cfbb61f21cb0373ada74eeb35d50;hb=f7b0c6f1fcbe56574a6544ecbe82f9284d7cf206;hp=1e3fb510a44d254d01a3b290ac6042764e785552;hpb=1a02ebcc612e9a9c0d87e02295c7258de3a70ccc;p=max%2Ftmk_keyboard.git
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index 1e3fb510..6057ea13 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
@@ -87,6 +99,9 @@ void keyboard_init(void)
void keyboard_task(void)
{
static matrix_row_t matrix_prev[MATRIX_ROWS];
+#ifdef MATRIX_HAS_GHOST
+ static matrix_row_t matrix_ghost[MATRIX_ROWS];
+#endif
static uint8_t led_status = 0;
matrix_row_t matrix_row = 0;
matrix_row_t matrix_change = 0;
@@ -96,24 +111,36 @@ void keyboard_task(void)
matrix_row = matrix_get_row(r);
matrix_change = matrix_row ^ matrix_prev[r];
if (matrix_change) {
- if (debug_matrix) matrix_print();
#ifdef MATRIX_HAS_GHOST
if (has_ghost_in_row(r)) {
- matrix_prev[r] = matrix_row;
+ /* Keep track of whether ghosted status has changed for
+ * debugging. But don't update matrix_prev until un-ghosted, or
+ * the last key would be lost.
+ */
+ if (debug_matrix && matrix_ghost[r] != matrix_row) {
+ matrix_print();
+ }
+ matrix_ghost[r] = matrix_row;
continue;
}
+ 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<