diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-07-06 18:05:50 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-07-06 18:05:50 -0400 |
| commit | c88207884b5fb16c8955b54b4331fc605158b9f2 (patch) | |
| tree | 3c929a4e018db257b7f0238f2a52d21600352bca /tmk_core/common | |
| parent | eb6e17be6fc378fdfb8c5c2c7253c17ffc07d225 (diff) | |
| parent | 5baaf871bbdd6667625860b0daef7fe9a91e08db (diff) | |
| download | qmk_firmware-c88207884b5fb16c8955b54b4331fc605158b9f2.tar.gz qmk_firmware-c88207884b5fb16c8955b54b4331fc605158b9f2.zip | |
Merge branch 'master' into lets-split-support
Diffstat (limited to 'tmk_core/common')
| -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 |