Merge pull request #81 from bgould/master

[tmk_firmware.git] / protocol / lufa / lufa.c

diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index 556d0aeecc82c8313aaa1037867d2fb3de2e4ef6..eca51c8784f2f37dd54301ee3c4822a42abd8e08 100644 (file)
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -40,8 +40,14 @@
 #include "host.h"
 #include "host_driver.h"
 #include "keyboard.h"
+#include "action.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"
@@ -140,8 +146,6 @@ 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)
 {
 }
@@ -156,17 +160,20 @@ 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();
+    suspend_wakeup_init();
 
-    // turn off LED
-    led_set(0);
+#ifdef SLEEP_LED_ENABLE
+    sleep_led_disable();
+    // NOTE: converters may not accept this
+    led_set(host_keyboard_leds());
+#endif
 }
 
 void EVENT_USB_Device_StartOfFrame(void)
@@ -213,6 +220,12 @@ void EVENT_USB_Device_ConfigurationChanged(void)
     ConfigSuccess &= ENDPOINT_CONFIG(CONSOLE_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT,
                                      CONSOLE_EPSIZE, ENDPOINT_BANK_SINGLE);
 #endif
+
+#ifdef NKRO_ENABLE
+    /* Setup NKRO HID Report Endpoints */
+    ConfigSuccess &= ENDPOINT_CONFIG(NKRO_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
+                                     NKRO_EPSIZE, ENDPOINT_BANK_SINGLE);
+#endif
 }
 
 /*
@@ -340,15 +353,34 @@ static void send_keyboard(report_keyboard_t *report)
 {
     uint8_t timeout = 0;
 
-    // TODO: handle NKRO report
+    if (USB_DeviceState != DEVICE_STATE_Configured)
+        return;
+
     /* Select the Keyboard Report Endpoint */
-    Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM);
+#ifdef NKRO_ENABLE
+    if (keyboard_nkro) {
+        Endpoint_SelectEndpoint(NKRO_IN_EPNUM);
+    }
+    else
+#endif
+    {
+        Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM);
+    }
 
     /* Check if Keyboard Endpoint Ready for Read/Write */
     while (--timeout && !Endpoint_IsReadWriteAllowed()) ;
 
     /* Write Keyboard Report Data */
-    Endpoint_Write_Stream_LE(report, sizeof(report_keyboard_t), NULL);
+#ifdef NKRO_ENABLE
+    if (keyboard_nkro) {
+        Endpoint_Write_Stream_LE(report, NKRO_EPSIZE, NULL);
+    }
+    else
+#endif
+    {
+        /* boot mode */
+        Endpoint_Write_Stream_LE(report, KEYBOARD_EPSIZE, NULL);
+    }
 
     /* Finalize the stream transfer to send the last packet */
     Endpoint_ClearIN();
@@ -361,6 +393,9 @@ static void send_mouse(report_mouse_t *report)
 #ifdef MOUSE_ENABLE
     uint8_t timeout = 0;
 
+    if (USB_DeviceState != DEVICE_STATE_Configured)
+        return;
+
     /* Select the Mouse Report Endpoint */
     Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
 
@@ -379,6 +414,9 @@ static void send_system(uint16_t data)
 {
     uint8_t timeout = 0;
 
+    if (USB_DeviceState != DEVICE_STATE_Configured)
+        return;
+
     report_extra_t r = {
         .report_id = REPORT_ID_SYSTEM,
         .usage = data
@@ -393,6 +431,9 @@ static void send_consumer(uint16_t data)
 {
     uint8_t timeout = 0;
 
+    if (USB_DeviceState != DEVICE_STATE_Configured)
+        return;
+
     report_extra_t r = {
         .report_id = REPORT_ID_CONSUMER,
         .usage = data
@@ -490,80 +531,38 @@ static void SetupHardware(void)
 
     // for Console_Task
     USB_Device_EnableSOFEvents();
+    print_set_sendchar(sendchar);
 }
 
-
-#include "matrix.h"
-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;
-}
-
-#include <avr/sleep.h>
-#include <avr/wdt.h>
-#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)
 {
     SetupHardware();
+    sei();
+
+    /* wait for USB startup & debug output */
+    while (USB_DeviceState != DEVICE_STATE_Configured) {
+#if defined(INTERRUPT_CONTROL_ENDPOINT)
+        ;
+#else
+        USB_USBTask();
+#endif
+    }
+    print("USB configured.\n");
+
+    /* init modules */
     keyboard_init();
     host_set_driver(&lufa_driver);
-    sei();
+#ifdef SLEEP_LED_ENABLE
+    sleep_led_init();
+#endif
 
+    print("Keyboard start.\n");
     while (1) {
-        // while suspend
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
-            // 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()) {
+            suspend_power_down();
+            if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
                     USB_Device_SendRemoteWakeup();
-                }
             }
         }
 
@@ -574,15 +573,3 @@ 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<<USB_LED_CAPS_LOCK)));
-    }
-}