diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/keyboard.c | 23 | ||||
| -rw-r--r-- | common/keyboard.h | 3 | ||||
| -rw-r--r-- | common/matrix.h | 5 |
3 files changed, 31 insertions, 0 deletions
diff --git a/common/keyboard.c b/common/keyboard.c index 9a809ff4a1..dde91a2968 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -15,6 +15,8 @@ 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 <avr/wdt.h> #include "keyboard.h" #include "matrix.h" #include "keymap.h" @@ -30,12 +32,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "bootmagic.h" #include "eeconfig.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 @@ -83,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); @@ -105,6 +127,7 @@ void keyboard_task(void) }); // 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; } diff --git a/common/keyboard.h b/common/keyboard.h index 60f8a89d1d..6442716fc7 100644 --- a/common/keyboard.h +++ b/common/keyboard.h @@ -62,6 +62,9 @@ void keyboard_init(void); void keyboard_task(void); void keyboard_set_leds(uint8_t leds); +__attribute__ ((weak)) void matrix_power_up(void) {} +__attribute__ ((weak)) void matrix_power_down(void) {} + #ifdef __cplusplus } #endif diff --git a/common/matrix.h b/common/matrix.h index d1d14a6ead..23fef78f74 100644 --- a/common/matrix.h +++ b/common/matrix.h @@ -53,4 +53,9 @@ matrix_row_t matrix_get_row(uint8_t row); void matrix_print(void); +/* power control */ +void matrix_power_up(void); +void matrix_power_down(void); + + #endif |