X-Git-Url: https://git.donarmstrong.com/?p=tmk_firmware.git;a=blobdiff_plain;f=common%2Fkeyboard.c;h=dde91a29689c9ae827807e44e2c412093f4081a9;hp=601e3abe17b6d06774d76e9e8b79d32c3993e76d;hb=608ebe2686bdb3fdbd0426731cabdf6082c57b53;hpb=eea3b699a6cf9976fc0179633feee6d079e5db78

diff --git a/common/keyboard.c b/common/keyboard.c
index 601e3ab..dde91a2 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <stdint.h>
 #include <util/delay.h>
+#include <avr/wdt.h>
 #include "keyboard.h"
 #include "matrix.h"
 #include "keymap.h"
@@ -30,8 +31,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sendchar.h"
 #include "bootmagic.h"
 #include "eeconfig.h"
-#include "mousekey.h"
 #include "backlight.h"
+#include "suspend.h"
+#ifdef MOUSEKEY_ENABLE
+#   include "mousekey.h"
+#endif
+#ifdef PS2_MOUSE_ENABLE
+#   include "ps2_mouse.h"
+#endif
+#include "lufa.h"
 
 
 #ifdef MATRIX_HAS_GHOST
@@ -79,7 +87,25 @@ void keyboard_task(void)
     static uint8_t led_status = 0;
     matrix_row_t matrix_row = 0;
     matrix_row_t matrix_change = 0;
+    static uint32_t last_key_time = 0;
 
+/*
+#define SLEEP_TIME_MS 10000
+    // (USB_DeviceState == DEVICE_STATE_Suspended) {
+    //if (timer_elapsed32(last_key_time) > SLEEP_TIME_MS) {
+    // TODO: remove LUFA dependent code
+    if (!USB_IsInitialized && timer_elapsed32(last_key_time) > SLEEP_TIME_MS) {
+        matrix_power_down();
+        // TODO: power down only when no USB connection
+        // Or it makes USB connection lost or suspended
+        suspend_power_down(WDTO_15MS);
+        matrix_power_up();
+    }
+    else {
+        matrix_power_down();
+        matrix_power_up();
+    }
+*/
     matrix_scan();
     for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
         matrix_row = matrix_get_row(r);
@@ -95,12 +121,13 @@ void keyboard_task(void)
             for (uint8_t c = 0; c < MATRIX_COLS; c++) {
                 if (matrix_change & ((matrix_row_t)1<<c)) {
                     action_exec((keyevent_t){
-                        .key = (key_t){ .row = r, .col = 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
                     matrix_prev[r] ^= ((matrix_row_t)1<<c);
+                    last_key_time = timer_read32();
                     // process a key per task call
                     goto MATRIX_LOOP_END;
                 }
@@ -111,10 +138,16 @@ 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
+
     // update LED
     if (led_status != host_keyboard_leds()) {
         led_status = host_keyboard_leds();