diff options
author | Joshua Colbeck <Skrymir@users.noreply.github.com> | 2016-07-12 23:14:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-12 23:14:30 -0500 |
commit | 68ceffe53e299fb504bdd4733b1555a8558b472b (patch) | |
tree | ae9cc958d239374478338fee2783c203517d6762 /tmk_core/protocol | |
parent | ac978a50a2f523f2de7f928a6b41ac40469911c2 (diff) | |
parent | a998a48673372e409991066d7d2d9ba282f79d59 (diff) |
Merge pull request #2 from jackhumbert/master
Pull from upstream
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r-- | tmk_core/protocol/chibios/main.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index aeb11752f4..b0eb9aef81 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c @@ -38,6 +38,9 @@ #ifdef SERIAL_LINK_ENABLE #include "serial_link/system/serial_link.h" #endif +#ifdef VISUALIZER_ENABLE +#include "visualizer/visualizer.h" +#endif #include "suspend.h" @@ -105,6 +108,11 @@ int main(void) { init_serial_link(); #endif +#ifdef VISUALIZER_ENABLE + visualizer_init(); +#endif + + host_driver_t* driver = NULL; /* Wait until the USB or serial link is active */ @@ -147,6 +155,9 @@ int main(void) { if(USB_DRIVER.state == USB_SUSPENDED) { print("[s]"); +#ifdef VISUALIZER_ENABLE + visualizer_suspend(); +#endif while(USB_DRIVER.state == USB_SUSPENDED) { /* Do this in the suspended state */ #ifdef SERIAL_LINK_ENABLE @@ -164,6 +175,10 @@ int main(void) { #ifdef MOUSEKEY_ENABLE mousekey_send(); #endif /* MOUSEKEY_ENABLE */ + +#ifdef VISUALIZER_ENABLE + visualizer_resume(); +#endif } keyboard_task(); |