aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/common/keyboard.c
diff options
context:
space:
mode:
authorGravatar Xyverz <xyverz@gmail.com>2017-02-20 23:54:09 -0800
committerGravatar Xyverz <xyverz@gmail.com>2017-02-20 23:54:09 -0800
commitbf6f7a623dbe4e3bba4bcc6d86ac28b842226825 (patch)
tree59ce47b0d4b21a2606e1f6d367317af8bdbd06ae /tmk_core/common/keyboard.c
parentca1ec7b121c973fae614e69093f40ee9ba25e629 (diff)
parent7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff)
downloadqmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.tar.gz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r--tmk_core/common/keyboard.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index 3aa82231b..eac1f1dd8 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -51,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
@@ -108,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