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/common/keyboard.c | |
| parent | ac978a50a2f523f2de7f928a6b41ac40469911c2 (diff) | |
| parent | a998a48673372e409991066d7d2d9ba282f79d59 (diff) | |
| download | qmk_firmware-68ceffe53e299fb504bdd4733b1555a8558b472b.tar.gz qmk_firmware-68ceffe53e299fb504bdd4733b1555a8558b472b.zip | |
Merge pull request #2 from jackhumbert/master
Pull from upstream
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 3a1262a9f..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/>. | |||
| 29 | #include "sendchar.h" | 29 | #include "sendchar.h" |
| 30 | #include "eeconfig.h" | 30 | #include "eeconfig.h" |
| 31 | #include "backlight.h" | 31 | #include "backlight.h" |
| 32 | #include "action_layer.h" | ||
| 32 | #ifdef BOOTMAGIC_ENABLE | 33 | #ifdef BOOTMAGIC_ENABLE |
| 33 | # include "bootmagic.h" | 34 | # include "bootmagic.h" |
| 34 | #else | 35 | #else |
| @@ -52,6 +53,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 52 | #ifdef SERIAL_LINK_ENABLE | 53 | #ifdef SERIAL_LINK_ENABLE |
| 53 | # include "serial_link/system/serial_link.h" | 54 | # include "serial_link/system/serial_link.h" |
| 54 | #endif | 55 | #endif |
| 56 | #ifdef VISUALIZER_ENABLE | ||
| 57 | # include "visualizer/visualizer.h" | ||
| 58 | #endif | ||
| 55 | 59 | ||
| 56 | #ifdef MATRIX_HAS_GHOST | 60 | #ifdef MATRIX_HAS_GHOST |
| 57 | static bool has_ghost_in_row(uint8_t row) | 61 | static bool has_ghost_in_row(uint8_t row) |
| @@ -181,6 +185,10 @@ MATRIX_LOOP_END: | |||
| 181 | serial_link_update(); | 185 | serial_link_update(); |
| 182 | #endif | 186 | #endif |
| 183 | 187 | ||
| 188 | #ifdef VISUALIZER_ENABLE | ||
| 189 | visualizer_update(default_layer_state, layer_state, host_keyboard_leds()); | ||
| 190 | #endif | ||
| 191 | |||
| 184 | // update LED | 192 | // update LED |
| 185 | if (led_status != host_keyboard_leds()) { | 193 | if (led_status != host_keyboard_leds()) { |
| 186 | led_status = host_keyboard_leds(); | 194 | led_status = host_keyboard_leds(); |
