1
0
Fork 0

USB initialize when plug-in during battery powered

This commit is contained in:
tmk 2014-11-20 17:06:46 +09:00
parent 6c06b9031f
commit c2d830c07c
3 changed files with 50 additions and 17 deletions

View file

@ -7,6 +7,9 @@
#include "backlight.h" #include "backlight.h"
#include "suspend_avr.h" #include "suspend_avr.h"
#include "suspend.h" #include "suspend.h"
#ifdef PROTOCOL_LUFA
#include "lufa.h"
#endif
#define wdt_intr_enable(value) \ #define wdt_intr_enable(value) \
@ -26,22 +29,37 @@ __asm__ __volatile__ ( \
) )
void suspend_power_down(void) void suspend_idle(uint8_t time)
{ {
#ifdef BACKLIGHT_ENABLE
backlight_set(0);
#endif
#ifndef NO_SUSPEND_POWER_DOWN
// Enable watchdog to wake from MCU sleep
cli(); cli();
wdt_reset(); set_sleep_mode(SLEEP_MODE_IDLE);
sleep_enable();
sei();
sleep_cpu();
sleep_disable();
}
// Watchdog Interrupt and System Reset Mode /* Power down MCU with watchdog timer
//wdt_enable(WDTO_1S); * wdto: watchdog timer timeout defined in <avr/wdt.h>
//WDTCSR |= _BV(WDIE); * WDTO_15MS
* WDTO_30MS
* WDTO_60MS
* WDTO_120MS
* WDTO_250MS
* WDTO_500MS
* WDTO_1S
* WDTO_2S
* WDTO_4S
* WDTO_8S
*/
void suspend_power_down(uint8_t wdto)
{
#ifdef PROTOCOL_LUFA
if (USB_DeviceState == DEVICE_STATE_Configured) return;
#endif
// Watchdog Interrupt Mode // Watchdog Interrupt Mode
wdt_intr_enable(WDTO_120MS); wdt_intr_enable(wdto);
// TODO: more power saving // TODO: more power saving
// See PicoPower application note // See PicoPower application note
@ -49,7 +67,7 @@ void suspend_power_down(void)
// - prescale clock // - prescale clock
// - BOD disable // - BOD disable
// - Power Reduction Register PRR // - Power Reduction Register PRR
// sleep in power down mode
set_sleep_mode(SLEEP_MODE_PWR_DOWN); set_sleep_mode(SLEEP_MODE_PWR_DOWN);
sleep_enable(); sleep_enable();
sei(); sei();
@ -58,12 +76,13 @@ void suspend_power_down(void)
// Disable watchdog after sleep // Disable watchdog after sleep
wdt_disable(); wdt_disable();
#endif
} }
bool suspend_wakeup_condition(void) bool suspend_wakeup_condition(void)
{ {
matrix_power_up();
matrix_scan(); matrix_scan();
matrix_power_down();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) { for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
if (matrix_get_row(r)) return true; if (matrix_get_row(r)) return true;
} }

View file

@ -5,7 +5,8 @@
#include <stdbool.h> #include <stdbool.h>
void suspend_power_down(void); void suspend_idle(uint8_t timeout);
void suspend_power_down(uint8_t timeout);
bool suspend_wakeup_condition(void); bool suspend_wakeup_condition(void);
void suspend_wakeup_init(void); void suspend_wakeup_init(void);

View file

@ -148,10 +148,23 @@ static void Console_Task(void)
*/ */
void EVENT_USB_Device_Connect(void) void EVENT_USB_Device_Connect(void)
{ {
/* For battery powered device */
if (!USB_IsInitialized) {
USB_Init();
USB_Device_EnableSOFEvents();
}
} }
void EVENT_USB_Device_Disconnect(void) void EVENT_USB_Device_Disconnect(void)
{ {
/* For battery powered device */
/* TODO: This doesn't work. After several plug in/outs can not be enumerated.
if (USB_IsInitialized) {
USB_Disable(); // Disable all interrupts
USB_Controller_Enable();
USB_INT_Enable(USB_INT_VBUSTI);
}
*/
} }
void EVENT_USB_Device_Reset(void) void EVENT_USB_Device_Reset(void)
@ -574,7 +587,7 @@ int main(void)
print("Keyboard start.\n"); print("Keyboard start.\n");
while (1) { while (1) {
while (USB_DeviceState == DEVICE_STATE_Suspended) { while (USB_DeviceState == DEVICE_STATE_Suspended) {
suspend_power_down(); suspend_power_down(WDTO_120MS);
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup(); USB_Device_SendRemoteWakeup();
} }