diff options
author | TerryMathews <terry@terrymathews.net> | 2017-04-08 00:30:54 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 00:30:54 -0400 |
commit | 3899bec4b603a0880055c60df534c5a86ad44a52 (patch) | |
tree | dd3ac70f403290fafff4bf8005925a3d5eed69cd /tmk_core/common/keyboard.c | |
parent | 2a2be010d9d8c10d872c01637f4b4cd263f9bc1b (diff) | |
parent | 154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff) |
Merge pull request #1 from qmk/master
Catchup
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r-- | tmk_core/common/keyboard.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 371d93f3e5..eac1f1dd81 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -14,6 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ + #include <stdint.h> #include "keyboard.h" #include "matrix.h" @@ -50,6 +51,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef RGBLIGHT_ENABLE # include "rgblight.h" #endif +#ifdef FAUXCLICKY_ENABLE +# include "fauxclicky.h" +#endif #ifdef SERIAL_LINK_ENABLE # include "serial_link/system/serial_link.h" #endif @@ -107,6 +111,9 @@ void keyboard_init(void) { #ifdef RGBLIGHT_ENABLE rgblight_init(); #endif +#ifdef FAUXCLICKY_ENABLE + fauxclicky_init(); +#endif #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) keymap_config.nkro = 1; #endif @@ -188,7 +195,7 @@ MATRIX_LOOP_END: #endif #ifdef VISUALIZER_ENABLE - visualizer_update(default_layer_state, layer_state, host_keyboard_leds()); + visualizer_update(default_layer_state, layer_state, visualizer_get_mods(), host_keyboard_leds()); #endif // update LED |