Browse Source

Add breathing sleep LED during USB suspend

tags/v1.9
tmk 11 years ago
parent
commit
f0c5f1b910
5 changed files with 128 additions and 9 deletions
  1. 6
    0
      common.mk
  2. 84
    0
      common/sleep_led.c
  3. 10
    0
      common/sleep_led.h
  4. 1
    0
      keyboard/gh60/Makefile.lufa
  5. 27
    9
      protocol/lufa/lufa.c

+ 6
- 0
common.mk View File

OPT_DEFS += -DMOUSE_ENABLE OPT_DEFS += -DMOUSE_ENABLE
endif endif


ifdef SLEEP_LED_ENABLE
SRC += $(COMMON_DIR)/sleep_led.c
OPT_DEFS += -DSLEEP_LED_ENABLE
endif


# Search Path # Search Path
VPATH += $(TOP_DIR)/common VPATH += $(TOP_DIR)/common

+ 84
- 0
common/sleep_led.c View File

#include <stdint.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#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<<USB_LED_CAPS_LOCK);
}
// LED off
if (timer.pwm.count == pgm_read_byte(&breathing_table[timer.pwm.index])) {
led_set(0);
}
}

+ 10
- 0
common/sleep_led.h View File

#ifndef SLEEP_LED_H
#define SLEEP_LED_H

#define NO_SUSPEND_POWER_DOWN

void sleep_led_init(void);
void sleep_led_enable(void);
void sleep_led_disable(void);

#endif

+ 1
- 0
keyboard/gh60/Makefile.lufa View File

MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400) CONSOLE_ENABLE = yes # Console for debug(+400)
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support



+ 27
- 9
protocol/lufa/lufa.c View File

this software. this software.
*/ */


#include <avr/sleep.h>
#include <avr/wdt.h>
#include "report.h" #include "report.h"
#include "host.h" #include "host.h"
#include "host_driver.h" #include "host_driver.h"
#include "keyboard.h" #include "keyboard.h"
#include "action.h"
#include "matrix.h"
#include "led.h"
#include "sendchar.h" #include "sendchar.h"
#include "debug.h" #include "debug.h"
#ifdef SLEEP_LED_ENABLE
#include "sleep_led.h"
#endif


#include "descriptor.h" #include "descriptor.h"
#include "lufa.h" #include "lufa.h"
* 2) EVENT_USB_Device_Reset * 2) EVENT_USB_Device_Reset
* 3) EVENT_USB_Device_Wake * 3) EVENT_USB_Device_Wake
*/ */
#include "led.h"
#include "matrix.h"
void EVENT_USB_Device_Connect(void) void EVENT_USB_Device_Connect(void)
{ {
led_set(0x1f); // all on
} }


void EVENT_USB_Device_Disconnect(void) void EVENT_USB_Device_Disconnect(void)


void EVENT_USB_Device_Suspend() void EVENT_USB_Device_Suspend()
{ {
#ifdef SLEEP_LED_ENABLE
sleep_led_enable();
#endif
} }


#include "action.h"
void EVENT_USB_Device_WakeUp() void EVENT_USB_Device_WakeUp()
{ {
// initialize // initialize
matrix_init(); matrix_init();
clear_keyboard(); 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) void EVENT_USB_Device_StartOfFrame(void)
} }




#include "matrix.h"
static bool wakeup_condition(void) static bool wakeup_condition(void)
{ {
matrix_scan(); matrix_scan();
return false; return false;
} }


#include <avr/sleep.h>
#include <avr/wdt.h>
#define wdt_intr_enable(value) \ #define wdt_intr_enable(value) \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
"in __tmp_reg__,__SREG__" "\n\t" \ "in __tmp_reg__,__SREG__" "\n\t" \
SetupHardware(); SetupHardware();
keyboard_init(); keyboard_init();
host_set_driver(&lufa_driver); host_set_driver(&lufa_driver);
#ifdef SLEEP_LED_ENABLE
sleep_led_init();
#endif
sei(); sei();


while (1) { while (1) {
// while suspend // while suspend
while (USB_DeviceState == DEVICE_STATE_Suspended) { while (USB_DeviceState == DEVICE_STATE_Suspended) {
#ifndef NO_SUSPEND_POWER_DOWN
// Enable watchdog to wake from MCU sleep // Enable watchdog to wake from MCU sleep
cli(); cli();
wdt_reset(); wdt_reset();


// Disable watchdog after sleep // Disable watchdog after sleep
wdt_disable(); wdt_disable();
#endif


// Send request of USB Wakeup from Suspend to host // Send request of USB Wakeup from Suspend to host
if (USB_Device_RemoteWakeupEnabled) { if (USB_Device_RemoteWakeupEnabled) {
} }
} }


/* watchdog timeout during sleep */
#ifndef NO_SUSPEND_POWER_DOWN
/* watchdog timeout */
ISR(WDT_vect) ISR(WDT_vect)
{ {
/* wakeup from MCU sleep mode */
/*
// blink LED // blink LED
static uint8_t led_state = 0; static uint8_t led_state = 0;
static uint8_t led_count = 0; static uint8_t led_count = 0;
if ((led_count & 0x07) == 0) { if ((led_count & 0x07) == 0) {
led_set((led_state ^= (1<<USB_LED_CAPS_LOCK))); led_set((led_state ^= (1<<USB_LED_CAPS_LOCK)));
} }
*/
} }
#endif

Loading…
Cancel
Save