X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=common%2Fkeyboard.c;h=1e3fb510a44d254d01a3b290ac6042764e785552;hb=8f1e311cd7624d765901c69e61837db33a51928b;hp=2c88b3e437cacf17b01af040d011b352a6038667;hpb=b60f9c6ac6fa9f63cba7ffb6872095a8f0788e42;p=max%2Ftmk_keyboard.git

diff --git a/common/keyboard.c b/common/keyboard.c
index 2c88b3e4..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 <http://www.gnu.org/licenses/>.
 */
 #include <stdint.h>
-#include <util/delay.h>
 #include "keyboard.h"
 #include "matrix.h"
 #include "keymap.h"
@@ -28,39 +27,56 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
 
 
-void keyboard_init(void)
+#ifdef MATRIX_HAS_GHOST
+static bool has_ghost_in_row(uint8_t row)
 {
-    // TODO: configuration of sendchar impl
-    print_sendchar_func = sendchar;
+    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)
+{
     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();
+#ifdef PS2_MOUSE_ENABLE
+    ps2_mouse_init();
 #endif
-
-    /* boot magic keys */
-#ifdef IS_BOOTMAGIC_BOOTLOADER
-    /* kick up bootloader */
-    if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump();
+#ifdef SERIAL_MOUSE_ENABLE
+    serial_mouse_init();
 #endif
-#ifdef IS_BOOTMAGIC_DEBUG
-    if (IS_BOOTMAGIC_DEBUG()) debug_enable = true;
+
+
+#ifdef BOOTMAGIC_ENABLE
+    bootmagic();
 #endif
 
-#ifdef PS2_MOUSE_ENABLE
-    ps2_mouse_init();
+#ifdef BACKLIGHT_ENABLE
+    backlight_init();
 #endif
 }
 
@@ -81,12 +97,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<<c)) {
                     action_exec((keyevent_t){
-                        .key.pos  = (keypos_t){ .row = r, .col = c },
-                        .pressed = (matrix_row & (1<<c)),
+                        .key = (keypos_t){ .row = r, .col = c },
+                        .pressed = (matrix_row & ((matrix_row_t)1<<c)),
                         .time = (timer_read() | 1) /* time should not be 0 */
                     });
                     // record a processed key
@@ -101,10 +122,20 @@ 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
+
+#ifdef SERIAL_MOUSE_ENABLE
+        serial_mouse_task();
+#endif
+
     // update LED
     if (led_status != host_keyboard_leds()) {
         led_status = host_keyboard_leds();
@@ -114,5 +145,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);
 }