diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-07 17:13:22 +0200 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-07 17:13:22 +0200 |
| commit | 97dfbd1afce005392aa8f067e89bdf95334bdea5 (patch) | |
| tree | 1b198dd239bcb49564c31f124978abde0b467a81 /tmk_core/common/keyboard.c | |
| parent | 2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d (diff) | |
| parent | ad43d450ca1b988d196da80e2a745f45f24068f6 (diff) | |
| download | qmk_firmware-97dfbd1afce005392aa8f067e89bdf95334bdea5.tar.gz qmk_firmware-97dfbd1afce005392aa8f067e89bdf95334bdea5.tar.xz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 81df8eb73..c46a701b3 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -29,6 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "sendchar.h" #include "eeconfig.h" #include "backlight.h" +#include "action_layer.h" #ifdef BOOTMAGIC_ENABLE # include "bootmagic.h" #else @@ -49,6 +50,12 @@ 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 VISUALIZER_ENABLE +# include "visualizer/visualizer.h" +#endif #ifdef MATRIX_HAS_GHOST static bool has_ghost_in_row(uint8_t row) @@ -167,11 +174,19 @@ 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 + +#ifdef VISUALIZER_ENABLE + visualizer_update(default_layer_state, layer_state, host_keyboard_leds()); #endif // update LED |