diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-03-05 22:58:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 22:58:13 +0100 |
| commit | 24ec8f509703cbaf9de7b41d251dbb7fcd339559 (patch) | |
| tree | 90f4f9adf406d92c6817c412256904a97c716daf /tmk_core/common/keyboard.c | |
| parent | b7b94bfb132aa5f2f79b587fcfa6b1197485db27 (diff) | |
| parent | 615bfc4eca8204b73c592a076ca02aeaeceb7e1e (diff) | |
| download | qmk_firmware-24ec8f509703cbaf9de7b41d251dbb7fcd339559.tar.gz qmk_firmware-24ec8f509703cbaf9de7b41d251dbb7fcd339559.zip | |
Merge pull request #18 from qmk/master
Merge from qmk
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 7653507928..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 |