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) | |
download | qmk_firmware-19f480992c015aec0a15dca43e740bad8b7834e6.tar.gz qmk_firmware-19f480992c015aec0a15dca43e740bad8b7834e6.zip |
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 81df8eb73..3a1262a9f 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/>. | |||
49 | #ifdef RGBLIGHT_ENABLE | 49 | #ifdef RGBLIGHT_ENABLE |
50 | # include "rgblight.h" | 50 | # include "rgblight.h" |
51 | #endif | 51 | #endif |
52 | #ifdef SERIAL_LINK_ENABLE | ||
53 | # include "serial_link/system/serial_link.h" | ||
54 | #endif | ||
52 | 55 | ||
53 | #ifdef MATRIX_HAS_GHOST | 56 | #ifdef MATRIX_HAS_GHOST |
54 | static bool has_ghost_in_row(uint8_t row) | 57 | static bool has_ghost_in_row(uint8_t row) |
@@ -167,11 +170,15 @@ MATRIX_LOOP_END: | |||
167 | #endif | 170 | #endif |
168 | 171 | ||
169 | #ifdef SERIAL_MOUSE_ENABLE | 172 | #ifdef SERIAL_MOUSE_ENABLE |
170 | serial_mouse_task(); | 173 | serial_mouse_task(); |
171 | #endif | 174 | #endif |
172 | 175 | ||
173 | #ifdef ADB_MOUSE_ENABLE | 176 | #ifdef ADB_MOUSE_ENABLE |
174 | adb_mouse_task(); | 177 | adb_mouse_task(); |
178 | #endif | ||
179 | |||
180 | #ifdef SERIAL_LINK_ENABLE | ||
181 | serial_link_update(); | ||
175 | #endif | 182 | #endif |
176 | 183 | ||
177 | // update LED | 184 | // update LED |