summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk <hasu@tmk-kbd.com>2014-11-26 11:25:45 +0900
committertmk <hasu@tmk-kbd.com>2015-01-15 17:08:48 +0900
commit05795cb0034e885bec37f782cfc6bddcae262637 (patch)
tree8dffd6f416da650e31c8a509d830415dc22cae52 /common
parent10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff)
Compensate timer during prower down
Diffstat (limited to 'common')
-rw-r--r--common/avr/suspend.c27
-rw-r--r--common/suspend.h2
2 files changed, 17 insertions, 12 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
diff --git a/common/suspend.h b/common/suspend.h
index f339c670ac..80617a8244 100644
--- a/common/suspend.h
+++ b/common/suspend.h
@@ -6,7 +6,7 @@
void suspend_idle(uint8_t timeout);
-void suspend_power_down(uint8_t timeout);
+void suspend_power_down(void);
bool suspend_wakeup_condition(void);
void suspend_wakeup_init(void);