diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-07-06 09:48:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 09:48:58 -0400 |
| commit | 19f480992c015aec0a15dca43e740bad8b7834e6 (patch) | |
| tree | 2d1470d076017af6d089a00f4bb317abdb331346 /tmk_core/common/keyboard.c | |
| parent | c6d671e54c249497b5c01ad9badaa50425f394f9 (diff) | |
| parent | e5726b017a9de2922ea923818c6e215600f68a85 (diff) | |
Merge pull request #487 from fredizzimo/serial_link_ergodox
Integrate serial link support for ChibiOS and Infinity Ergodox
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 81df8eb73b..3a1262a9f9 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -49,6 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef RGBLIGHT_ENABLE # include "rgblight.h" #endif +#ifdef SERIAL_LINK_ENABLE +# include "serial_link/system/serial_link.h" +#endif #ifdef MATRIX_HAS_GHOST static bool has_ghost_in_row(uint8_t row) @@ -167,11 +170,15 @@ MATRIX_LOOP_END: #endif #ifdef SERIAL_MOUSE_ENABLE - serial_mouse_task(); + serial_mouse_task(); #endif #ifdef ADB_MOUSE_ENABLE - adb_mouse_task(); + adb_mouse_task(); +#endif + +#ifdef SERIAL_LINK_ENABLE + serial_link_update(); #endif // update LED |