summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/keyboard.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-17 00:51:58 +0200
committerJack Humbert <jack.humb@gmail.com>2016-04-17 00:51:58 +0200
commitab19ebd08a8b955775e6fa94cdf6b8d128d8b43c (patch)
tree7120e8037a1a9935b3b9e4109e251530f893c3b3 /tmk_core/common/keyboard.c
parent5f648b6c4060d586c343ea05562c607e2630dfc4 (diff)
downloadqmk_firmware-ab19ebd08a8b955775e6fa94cdf6b8d128d8b43c.tar.gz
qmk_firmware-ab19ebd08a8b955775e6fa94cdf6b8d128d8b43c.tar.xz
MAGIC functionality, AG swap in default layout
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r--tmk_core/common/keyboard.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index 302b3ec87..1d9981848 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -27,7 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command.h"
#include "util.h"
#include "sendchar.h"
-#include "bootmagic.h"
+#ifdef BOOTMAGIC_ENABLE
+ #include "bootmagic.h"
+#else
+ #include "magic.h"
+#endif
#include "eeconfig.h"
#include "backlight.h"
#ifdef MOUSEKEY_ENABLE
@@ -86,6 +90,8 @@ void keyboard_init(void)
#ifdef BOOTMAGIC_ENABLE
bootmagic();
+#else
+ magic();
#endif
#ifdef BACKLIGHT_ENABLE