From c8cfde01389a7f945e237b8571c1d4202e0d60d0 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 13 Mar 2013 16:01:53 +0900 Subject: [PATCH 1/3] Add intial code of RemoteWakeUp --- protocol/lufa/lufa.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index 98c3a68f..fc3798cd 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -133,16 +133,29 @@ static void Console_Task(void) /******************************************************************************* * USB Events ******************************************************************************/ -/** Event handler for the USB_Connect event. */ +#include "led.h" void EVENT_USB_Device_Connect(void) { } -/** Event handler for the USB_Disconnect event. */ void EVENT_USB_Device_Disconnect(void) { } +void EVENT_USB_Device_Reset(void) +{ +} + +void EVENT_USB_Device_Suspend() +{ + led_set(1< Date: Thu, 14 Mar 2013 22:45:02 +0900 Subject: [PATCH 2/3] Add power down mode sleep and watchdog interrupt --- protocol/lufa/lufa.c | 74 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index fc3798cd..556d0aee 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -133,7 +133,15 @@ static void Console_Task(void) /******************************************************************************* * USB Events ******************************************************************************/ +/* + * Event Order of Plug in: + * 0) EVENT_USB_Device_Connect + * 1) EVENT_USB_Device_Suspend + * 2) EVENT_USB_Device_Reset + * 3) EVENT_USB_Device_Wake +*/ #include "led.h" +#include "matrix.h" void EVENT_USB_Device_Connect(void) { } @@ -148,11 +156,16 @@ void EVENT_USB_Device_Reset(void) void EVENT_USB_Device_Suspend() { - led_set(1< +#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" \ +) + int main(void) __attribute__ ((weak)); int main(void) { @@ -499,9 +530,36 @@ int main(void) sei(); while (1) { + // while suspend while (USB_DeviceState == DEVICE_STATE_Suspended) { - // TODO: power saving + // 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(); + + // Send request of USB Wakeup from Suspend to host if (USB_Device_RemoteWakeupEnabled) { if (wakeup_condition()) { USB_Device_SendRemoteWakeup(); @@ -516,3 +574,15 @@ int main(void) #endif } } + +/* watchdog timeout during sleep */ +ISR(WDT_vect) +{ + // 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: Fri, 15 Mar 2013 22:22:57 +0900 Subject: [PATCH 3/3] Add breathing sleep LED during USB suspend --- common.mk | 6 +++ common/sleep_led.c | 84 +++++++++++++++++++++++++++++++++++++ common/sleep_led.h | 10 +++++ keyboard/gh60/Makefile.lufa | 1 + protocol/lufa/lufa.c | 36 ++++++++++++---- 5 files changed, 128 insertions(+), 9 deletions(-) create mode 100644 common/sleep_led.c create mode 100644 common/sleep_led.h diff --git a/common.mk b/common.mk index f9faf2f9..4054893b 100644 --- a/common.mk +++ b/common.mk @@ -47,5 +47,11 @@ ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) OPT_DEFS += -DMOUSE_ENABLE endif +ifdef SLEEP_LED_ENABLE + SRC += $(COMMON_DIR)/sleep_led.c + OPT_DEFS += -DSLEEP_LED_ENABLE +endif + + # Search Path VPATH += $(TOP_DIR)/common diff --git a/common/sleep_led.c b/common/sleep_led.c new file mode 100644 index 00000000..edf68c35 --- /dev/null +++ b/common/sleep_led.c @@ -0,0 +1,84 @@ +#include +#include +#include +#include +#include "led.h" +#include "sleep_led.h" + +/* Software PWM + * ______ ______ __ + * | ON |___OFF___| ON |___OFF___| .... + * |<-------------->|<-------------->|<- .... + * PWM period PWM period + * + * 256 interrupts/period[resolution] + * 64 periods/second[frequency] + * 256*64 interrupts/second + * F_CPU/(256*64) clocks/interrupt + */ +#define SLEEP_LED_TIMER_TOP F_CPU/(256*64) + +void sleep_led_init(void) +{ + /* Timer1 setup */ + /* CTC mode */ + TCCR1B |= _BV(WGM12); + /* Clock selelct: clk/1 */ + TCCR1B |= _BV(CS10); + /* Set TOP value */ + uint8_t sreg = SREG; + cli(); + OCR1AH = (SLEEP_LED_TIMER_TOP>>8)&0xff; + OCR1AL = SLEEP_LED_TIMER_TOP&0xff; + SREG = sreg; +} + +void sleep_led_enable(void) +{ + /* Enable Compare Match Interrupt */ + TIMSK1 |= _BV(OCIE1A); +} + +void sleep_led_disable(void) +{ + /* Disable Compare Match Interrupt */ + TIMSK1 &= ~_BV(OCIE1A); +} + + +/* Breathing Sleep LED brighness(PWM On period) table + * (32[steps] * 8[duration]) / 64[PWM periods/s] = 4 second breath cycle + */ +static const uint8_t breathing_table[32] PROGMEM = { + 0, 0, 0, 2, 9, 21, 37, 56, 78, 127, 151, 175, 197, 216, 232, 244, + 254, 244, 216, 197, 175, 151, 127, 78, 56, 37, 21, 9, 2, 0, 0, 0 +}; + +ISR(TIMER1_COMPA_vect) +{ + /* Software PWM + * timer:1111 1111 1111 1111 + * \----/\-/ \-------/+--- count(0-255) + * | +--------------- duration of step(8) + * +-------------------- index of step table(0-31) + */ + static union { + uint16_t row; + struct { + uint8_t count:8; + uint8_t duration:3; + uint8_t index:5; + } pwm; + } timer = { .row = 0 }; + + timer.row++; + + // LED on + if (timer.pwm.count == 0) { + led_set(1< +#include #include "report.h" #include "host.h" #include "host_driver.h" #include "keyboard.h" +#include "action.h" +#include "matrix.h" +#include "led.h" #include "sendchar.h" #include "debug.h" +#ifdef SLEEP_LED_ENABLE +#include "sleep_led.h" +#endif #include "descriptor.h" #include "lufa.h" @@ -140,10 +148,9 @@ static void Console_Task(void) * 2) EVENT_USB_Device_Reset * 3) EVENT_USB_Device_Wake */ -#include "led.h" -#include "matrix.h" void EVENT_USB_Device_Connect(void) { + led_set(0x1f); // all on } void EVENT_USB_Device_Disconnect(void) @@ -156,17 +163,21 @@ void EVENT_USB_Device_Reset(void) void EVENT_USB_Device_Suspend() { +#ifdef SLEEP_LED_ENABLE + sleep_led_enable(); +#endif } -#include "action.h" void EVENT_USB_Device_WakeUp() { // initialize matrix_init(); clear_keyboard(); - // turn off LED - led_set(0); +#ifdef SLEEP_LED_ENABLE + sleep_led_disable(); +#endif + led_set(host_keyboard_leds()); } void EVENT_USB_Device_StartOfFrame(void) @@ -493,7 +504,6 @@ static void SetupHardware(void) } -#include "matrix.h" static bool wakeup_condition(void) { matrix_scan(); @@ -503,8 +513,6 @@ static bool wakeup_condition(void) return false; } -#include -#include #define wdt_intr_enable(value) \ __asm__ __volatile__ ( \ "in __tmp_reg__,__SREG__" "\n\t" \ @@ -527,11 +535,15 @@ int main(void) SetupHardware(); keyboard_init(); host_set_driver(&lufa_driver); +#ifdef SLEEP_LED_ENABLE + sleep_led_init(); +#endif sei(); while (1) { // while suspend while (USB_DeviceState == DEVICE_STATE_Suspended) { +#ifndef NO_SUSPEND_POWER_DOWN // Enable watchdog to wake from MCU sleep cli(); wdt_reset(); @@ -558,6 +570,7 @@ int main(void) // Disable watchdog after sleep wdt_disable(); +#endif // Send request of USB Wakeup from Suspend to host if (USB_Device_RemoteWakeupEnabled) { @@ -575,9 +588,12 @@ int main(void) } } -/* watchdog timeout during sleep */ +#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; @@ -585,4 +601,6 @@ ISR(WDT_vect) if ((led_count & 0x07) == 0) { led_set((led_state ^= (1<