X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeyboard.c;h=6bc6fae6e25f55bf5e2b2bedb9b2c079b3a9f132;hb=3f48b13f81f276dc8d0bd96607b70d13f9b5e883;hp=e4bc3dc8c26fadf01fff978c633c2dfe3c163743;hpb=7a31451a077a55e1ad97cf8b31a111c7cd311a4d;p=max%2Ftmk_keyboard.git
diff --git a/common/keyboard.c b/common/keyboard.c
index e4bc3dc8..6bc6fae6 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -28,40 +28,43 @@ along with this program. If not, see .
#include "command.h"
#include "util.h"
#include "sendchar.h"
-#include "bootloader.h"
-#ifdef MOUSEKEY_ENABLE
+#include "bootmagic.h"
+#include "eeconfig.h"
#include "mousekey.h"
+
+
+#ifdef MATRIX_HAS_GHOST
+static bool has_ghost_in_row(uint8_t row)
+{
+ matrix_row_t matrix_row = matrix_get_row(row);
+ // No ghost exists when less than 2 keys are down on the row
+ if (((matrix_row - 1) & matrix_row) == 0)
+ return false;
+
+ // Ghost occurs when the row shares column line with other row
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+ if (i != row && (matrix_get_row(i) & matrix_row))
+ return true;
+ }
+ return false;
+}
#endif
void keyboard_init(void)
{
// TODO: configuration of sendchar impl
- print_sendchar_func = sendchar;
+ print_set_sendchar(sendchar);
timer_init();
matrix_init();
-
- /* matrix scan for boot magic keys */
-#ifdef DEBOUNCE
- uint8_t scan = DEBOUNCE * 2;
- while (scan--) { matrix_scan(); _delay_ms(1); }
-#else
- matrix_scan();
-#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()) debug_enable = true;
-#endif
-
#ifdef PS2_MOUSE_ENABLE
ps2_mouse_init();
#endif
+
+#ifdef BOOTMAGIC_ENABLE
+ bootmagic();
+#endif
}
/*
@@ -81,12 +84,17 @@ void keyboard_task(void)
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;
+ continue;
+ }
+#endif
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & ((matrix_row_t)1<