diff options
| author | tmk <nobody@nowhere> | 2014-08-26 05:02:37 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-08-26 05:02:37 +0900 |
| commit | b316f19871ab39e6a75146d74a3b5cca37165f3c (patch) | |
| tree | 66d06b895fea2e85da612d06604ab59234dc46b7 /protocol/lufa/lufa.c | |
| parent | 10eb70acb4c8a03fc5bda32d9c23fc41266aef7a (diff) | |
| parent | 03fd4a6ff0fcccf8d7683b7fac3d9e6ae4fb635e (diff) | |
Merge branch 'serial-mouse' of git://github.com/rhaberkorn/tmk_keyboard into rhaberkorn-serial-mouse
Diffstat (limited to 'protocol/lufa/lufa.c')
| -rw-r--r-- | protocol/lufa/lufa.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index 16a602df13..58201e5c98 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -49,6 +49,10 @@ #endif #include "suspend.h" +#ifdef SERIAL_MOUSE_ENABLE +#include "serial_mouse.h" +#endif + #include "descriptor.h" #include "lufa.h" @@ -571,6 +575,10 @@ int main(void) sleep_led_init(); #endif +#ifdef SERIAL_MOUSE_ENABLE + serial_mouse_init(); +#endif + print("Keyboard start.\n"); while (1) { while (USB_DeviceState == DEVICE_STATE_Suspended) { @@ -582,6 +590,10 @@ int main(void) keyboard_task(); +#ifdef SERIAL_MOUSE_ENABLE + serial_mouse_task(); +#endif + #if !defined(INTERRUPT_CONTROL_ENDPOINT) USB_USBTask(); #endif |