diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-03-16 12:01:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-03-16 12:01:35 -0400 |
| commit | 9307a0a3e415d33d0858283f67fcba4c59a042ff (patch) | |
| tree | 45252e53439dde1122945646f4fa340cf0a8923e /common/avr/suspend.c | |
| parent | be86aefdbda560d6810f9594169fee4385c1422d (diff) | |
| parent | c35c4283b9c2c65d62fe8dc5e4b7ca49a8f5af33 (diff) | |
Merge pull request #6 from tmk/master
pulling from tmk
Diffstat (limited to 'common/avr/suspend.c')
| -rw-r--r-- | common/avr/suspend.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/common/avr/suspend.c b/common/avr/suspend.c index 66a579fd78..80243f02bc 100644 --- a/common/avr/suspend.c +++ b/common/avr/suspend.c @@ -7,6 +7,7 @@ #include "backlight.h" #include "suspend_avr.h" #include "suspend.h" +#include "timer.h" #ifdef PROTOCOL_LUFA #include "lufa.h" #endif @@ -52,11 +53,13 @@ void suspend_idle(uint8_t time) * WDTO_4S * WDTO_8S */ -void suspend_power_down(uint8_t wdto) +static uint8_t wdt_timeout = 0; +static void power_down(uint8_t wdto) { #ifdef PROTOCOL_LUFA if (USB_DeviceState == DEVICE_STATE_Configured) return; #endif + wdt_timeout = wdto; // Watchdog Interrupt Mode wdt_intr_enable(wdto); @@ -67,7 +70,6 @@ void suspend_power_down(uint8_t wdto) // - prescale clock // - BOD disable // - Power Reduction Register PRR - set_sleep_mode(SLEEP_MODE_PWR_DOWN); sleep_enable(); sei(); @@ -78,6 +80,11 @@ void suspend_power_down(uint8_t wdto) wdt_disable(); } +void suspend_power_down(void) +{ + power_down(WDTO_15MS); +} + bool suspend_wakeup_condition(void) { matrix_power_up(); @@ -103,15 +110,13 @@ void suspend_wakeup_init(void) /* watchdog timeout */ ISR(WDT_vect) { - /* wakeup from MCU sleep mode */ -/* - // blink LED - static uint8_t led_state = 0; - static uint8_t led_count = 0; - led_count++; - if ((led_count & 0x07) == 0) { - led_set((led_state ^= (1<<USB_LED_CAPS_LOCK))); + // compensate timer for sleep + switch (wdt_timeout) { + case WDTO_15MS: + timer_count += 15 + 2; // WDTO_15MS + 2(from observation) + break; + default: + ; } -*/ } #endif |