diff options
| author | Xyverz <xyverz@gmail.com> | 2017-02-20 23:54:09 -0800 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-02-20 23:54:09 -0800 |
| commit | bf6f7a623dbe4e3bba4bcc6d86ac28b842226825 (patch) | |
| tree | 59ce47b0d4b21a2606e1f6d367317af8bdbd06ae /tmk_core/common/keyboard.c | |
| parent | ca1ec7b121c973fae614e69093f40ee9ba25e629 (diff) | |
| parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) | |
| download | qmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.tar.gz qmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 6 |
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/>. | |||
| 51 | #ifdef RGBLIGHT_ENABLE | 51 | #ifdef RGBLIGHT_ENABLE |
| 52 | # include "rgblight.h" | 52 | # include "rgblight.h" |
| 53 | #endif | 53 | #endif |
| 54 | #ifdef FAUXCLICKY_ENABLE | ||
| 55 | # include "fauxclicky.h" | ||
| 56 | #endif | ||
| 54 | #ifdef SERIAL_LINK_ENABLE | 57 | #ifdef SERIAL_LINK_ENABLE |
| 55 | # include "serial_link/system/serial_link.h" | 58 | # include "serial_link/system/serial_link.h" |
| 56 | #endif | 59 | #endif |
| @@ -108,6 +111,9 @@ void keyboard_init(void) { | |||
| 108 | #ifdef RGBLIGHT_ENABLE | 111 | #ifdef RGBLIGHT_ENABLE |
| 109 | rgblight_init(); | 112 | rgblight_init(); |
| 110 | #endif | 113 | #endif |
| 114 | #ifdef FAUXCLICKY_ENABLE | ||
| 115 | fauxclicky_init(); | ||
| 116 | #endif | ||
| 111 | #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) | 117 | #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) |
| 112 | keymap_config.nkro = 1; | 118 | keymap_config.nkro = 1; |
| 113 | #endif | 119 | #endif |