diff options
| author | tmk <hasu@tmk-kbd.com> | 2014-11-26 11:25:45 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-01-15 17:08:48 +0900 |
| commit | 05795cb0034e885bec37f782cfc6bddcae262637 (patch) | |
| tree | 8dffd6f416da650e31c8a509d830415dc22cae52 /keyboard | |
| parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
Compensate timer during prower down
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/hhkb_rn42/MEMO.txt | 7 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/matrix.c | 2 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/main.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt index 337dad6039..062ee3399a 100644 --- a/keyboard/hhkb_rn42/MEMO.txt +++ b/keyboard/hhkb_rn42/MEMO.txt @@ -9,10 +9,15 @@ Bug: - Do not power-down during USB connection is active - DONE 11/11 (USB_DeviceState == USB_DEVICE_Configured) is used to check USB connection matrix_power_down() matrix.c - 11/23 +- timer is slow while power down - DONE 11/26 + - time out interrupt is lost while power down? + - interrupt of watchdog timer compensates timer counter(avr/suspend.c) Todo: Design: +- suspend.h - DONE 11/26 + - remove argument from suspend_power_down() for backward compatitibility - remove MCU dependent power saving code from core/keyboard - it should be located in project matrix.c - DONE 11/23 - HHKB matrix.c needs matrix_prev? @@ -47,6 +52,8 @@ Power saving: - During USB suspend change clock source to internal RC from external Xtal(6.8) - FRZCLK: you can freeze clock for power saving. still WAKEUPI and VBUSTI interrupts are available while freezing.(21.7.3) - Suspend: Clear Suspend Bit, Freeze clock, disable PLL, MCU sleep(21.13) +- Voltage reference(8.1.1) + - to reduce power consumption while power down mode Improving: - BT LED; connecting, linked, sleeping, deep sleeping diff --git a/keyboard/hhkb_rn42/matrix.c b/keyboard/hhkb_rn42/matrix.c index c6c444ff52..513a271e4e 100644 --- a/keyboard/hhkb_rn42/matrix.c +++ b/keyboard/hhkb_rn42/matrix.c @@ -186,6 +186,6 @@ void matrix_power_down(void) { if (USB_DeviceState == DEVICE_STATE_Configured) return; if (timer_elapsed32(matrix_last_modified) <= MATRIX_POWER_SAVE) return; KEY_POWER_OFF(); - suspend_power_down(WDTO_15MS); + suspend_power_down(); matrix_power = false; } diff --git a/keyboard/hhkb_rn42/rn42/main.c b/keyboard/hhkb_rn42/rn42/main.c index 43d887067d..a3a37c0747 100644 --- a/keyboard/hhkb_rn42/rn42/main.c +++ b/keyboard/hhkb_rn42/rn42/main.c @@ -85,7 +85,7 @@ int main(void) print("Keyboard start.\n"); while (1) { while (USB_DeviceState == DEVICE_STATE_Suspended) { - suspend_power_down(WDTO_120MS); + suspend_power_down(); if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { USB_Device_SendRemoteWakeup(); } |