From 2c0bb5e7e620b0472f110d2cbc5768bb6d97eec5 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 25 Mar 2013 01:46:32 +0900 Subject: Add common/suspend.c --- common/sleep_led.h | 13 ++++++++++++- common/suspend.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ common/suspend.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 common/suspend.c create mode 100644 common/suspend.h (limited to 'common') diff --git a/common/sleep_led.h b/common/sleep_led.h index aebdbeaa5a..6bdcf558a4 100644 --- a/common/sleep_led.h +++ b/common/sleep_led.h @@ -1,10 +1,21 @@ #ifndef SLEEP_LED_H #define SLEEP_LED_H -#define NO_SUSPEND_POWER_DOWN + +#ifdef SLEEP_LED_ENABLE void sleep_led_init(void); void sleep_led_enable(void); void sleep_led_disable(void); +void sleep_led_toggle(void); + +#else + +#define sleep_led_init() +#define sleep_led_enable() +#define sleep_led_disable() +#define sleep_led_toggle() + +#endif #endif diff --git a/common/suspend.c b/common/suspend.c new file mode 100644 index 0000000000..397e0729a6 --- /dev/null +++ b/common/suspend.c @@ -0,0 +1,51 @@ +#include "suspend.h" +#include "matrix.h" +#include "action.h" + + +void suspend_power_down(void) +{ +#ifndef NO_SUSPEND_POWER_DOWN + // Enable watchdog to wake from MCU sleep + cli(); + wdt_reset(); + + // Watchdog Interrupt and System Reset Mode + //wdt_enable(WDTO_1S); + //WDTCSR |= _BV(WDIE); + + // Watchdog Interrupt Mode + wdt_intr_enable(WDTO_120MS); + + // TODO: more power saving + // See PicoPower application note + // - I/O port input with pullup + // - prescale clock + // - BOD disable + // - Power Reduction Register PRR + // sleep in power down mode + set_sleep_mode(SLEEP_MODE_PWR_DOWN); + sleep_enable(); + sei(); + sleep_cpu(); + sleep_disable(); + + // Disable watchdog after sleep + wdt_disable(); +#endif +} + +bool suspend_wakeup_condition(void) +{ + matrix_scan(); + for (uint8_t r = 0; r < MATRIX_ROWS; r++) { + if (matrix_get_row(r)) return true; + } + return false; +} + +void suspend_wakeup_init(void) +{ + matrix_init(); + clear_keyboard(); +} diff --git a/common/suspend.h b/common/suspend.h new file mode 100644 index 0000000000..1c1e41ac3e --- /dev/null +++ b/common/suspend.h @@ -0,0 +1,32 @@ +#ifndef SUSPEND_H +#define SUSPEND_H + +#include +#include +#include +#include +#include + + +#define wdt_intr_enable(value) \ +__asm__ __volatile__ ( \ + "in __tmp_reg__,__SREG__" "\n\t" \ + "cli" "\n\t" \ + "wdr" "\n\t" \ + "sts %0,%1" "\n\t" \ + "out __SREG__,__tmp_reg__" "\n\t" \ + "sts %0,%2" "\n\t" \ + : /* no outputs */ \ + : "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \ + "r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \ + "r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \ + _BV(WDIE) | (value & 0x07)) ) \ + : "r0" \ +) + + +void suspend_power_down(void); +bool suspend_wakeup_condition(void); +void suspend_wakeup_init(void); + +#endif -- cgit v1.2.3 From afc3148e2341e4be982cdb628543e30923cfdaf7 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 26 Mar 2013 16:55:45 +0900 Subject: Add supsend and wakeup to pjrc stack --- common/suspend.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'common') diff --git a/common/suspend.c b/common/suspend.c index 397e0729a6..6029fe7ffa 100644 --- a/common/suspend.c +++ b/common/suspend.c @@ -44,8 +44,27 @@ bool suspend_wakeup_condition(void) return false; } +// run immediately after wakeup void suspend_wakeup_init(void) { + // clear matrix and keyboard state matrix_init(); clear_keyboard(); } + +#ifndef NO_SUSPEND_POWER_DOWN +/* 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< Date: Wed, 27 Mar 2013 15:21:50 +0900 Subject: Add sleep LED test command --- common/command.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'common') diff --git a/common/command.c b/common/command.c index cb98e1d5f2..b29333883e 100644 --- a/common/command.c +++ b/common/command.c @@ -28,6 +28,8 @@ along with this program. If not, see . #include "bootloader.h" #include "layer_switch.h" #include "eeconfig.h" +#include "sleep_led.h" +#include "led.h" #include "command.h" #ifdef MOUSEKEY_ENABLE @@ -152,6 +154,12 @@ static bool command_common(uint8_t code) { static host_driver_t *host_driver = 0; switch (code) { + case KC_Z: + // test breathing sleep LED + print("Sleep LED test\n"); + sleep_led_toggle(); + led_set(host_keyboard_leds()); + break; #ifdef BOOTMAGIC_ENABLE case KC_E: print("eeprom config\n"); -- cgit v1.2.3