Add supsend and wakeup to pjrc stack
tmk
parent
2c0bb5e7e6
commit
afc3148e23
|
|
@ -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<<USB_LED_CAPS_LOCK)));
|
||||
}
|
||||
*/
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -36,20 +36,18 @@
|
|||
this software.
|
||||
*/
|
||||
|
||||
#include <avr/sleep.h>
|
||||
#include <avr/wdt.h>
|
||||
#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 "suspend.h"
|
||||
|
||||
#include "descriptor.h"
|
||||
#include "lufa.h"
|
||||
|
|
@ -170,9 +168,7 @@ void EVENT_USB_Device_Suspend()
|
|||
|
||||
void EVENT_USB_Device_WakeUp()
|
||||
{
|
||||
// initialize
|
||||
matrix_init();
|
||||
clear_keyboard();
|
||||
suspend_wakeup_init();
|
||||
|
||||
#ifdef SLEEP_LED_ENABLE
|
||||
sleep_led_disable();
|
||||
|
|
@ -503,32 +499,6 @@ static void SetupHardware(void)
|
|||
USB_Device_EnableSOFEvents();
|
||||
}
|
||||
|
||||
|
||||
static bool wakeup_condition(void)
|
||||
{
|
||||
matrix_scan();
|
||||
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
|
||||
if (matrix_get_row(r)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#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)
|
||||
{
|
||||
|
|
@ -541,44 +511,12 @@ int main(void)
|
|||
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();
|
||||
|
||||
// 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
|
||||
|
||||
// Send request of USB Wakeup from Suspend to host
|
||||
if (USB_Device_RemoteWakeupEnabled) {
|
||||
if (wakeup_condition()) {
|
||||
suspend_power_down();
|
||||
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
|
||||
USB_Device_SendRemoteWakeup();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
keyboard_task();
|
||||
|
||||
|
|
@ -587,20 +525,3 @@ int main(void)
|
|||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#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<<USB_LED_CAPS_LOCK)));
|
||||
}
|
||||
*/
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,10 +31,7 @@
|
|||
#include "print.h"
|
||||
#include "debug.h"
|
||||
#include "util.h"
|
||||
#include "bootloader.h"
|
||||
#ifdef PS2_MOUSE_ENABLE
|
||||
# include "ps2_mouse.h"
|
||||
#endif
|
||||
#include "suspend.h"
|
||||
#include "host.h"
|
||||
#include "pjrc.h"
|
||||
|
||||
|
|
@ -55,7 +52,17 @@ int main(void)
|
|||
|
||||
keyboard_init();
|
||||
host_set_driver(pjrc_driver());
|
||||
#ifdef SLEEP_LED_ENABLE
|
||||
sleep_led_init();
|
||||
#endif
|
||||
while (1) {
|
||||
while (suspend) {
|
||||
suspend_power_down();
|
||||
if (remote_wakeup && suspend_wakeup_condition()) {
|
||||
usb_remote_wakeup();
|
||||
}
|
||||
}
|
||||
|
||||
keyboard_task();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@
|
|||
#include "usb_extra.h"
|
||||
#include "print.h"
|
||||
#include "util.h"
|
||||
#include "sleep_led.h"
|
||||
#include "suspend.h"
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
|
|
@ -595,7 +597,8 @@ void usb_init(void)
|
|||
USB_CONFIG(); // start USB clock
|
||||
UDCON = 0; // enable attach resistor
|
||||
usb_configuration = 0;
|
||||
UDIEN = (1<<EORSTE)|(1<<SOFE)|(1<<SUSPE);
|
||||
suspend = false;
|
||||
UDIEN = (1<<EORSTE)|(1<<SOFE)|(1<<SUSPE)|(1<<WAKEUPE);
|
||||
sei();
|
||||
}
|
||||
|
||||
|
|
@ -631,9 +634,23 @@ ISR(USB_GEN_vect)
|
|||
|
||||
intbits = UDINT;
|
||||
UDINT = 0;
|
||||
if (intbits & (1<<SUSPI)) {
|
||||
if ((intbits & (1<<SUSPI)) && (UDIEN & (1<<SUSPE)) && usb_configuration) {
|
||||
#ifdef SLEEP_LED_ENABLE
|
||||
sleep_led_enable();
|
||||
#endif
|
||||
UDIEN &= ~(1<<SUSPE);
|
||||
UDIEN |= (1<<WAKEUPE);
|
||||
suspend = true;
|
||||
} else {
|
||||
}
|
||||
if ((intbits & (1<<WAKEUPI)) && (UDIEN & (1<<WAKEUPE)) && usb_configuration) {
|
||||
suspend_wakeup_init();
|
||||
#ifdef SLEEP_LED_ENABLE
|
||||
sleep_led_disable();
|
||||
#endif
|
||||
led_set(host_keyboard_leds());
|
||||
|
||||
UDIEN |= (1<<SUSPE);
|
||||
UDIEN &= ~(1<<WAKEUPE);
|
||||
suspend = false;
|
||||
}
|
||||
if (intbits & (1<<EORSTI)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue