Merge commit '71381457fa'

Conflicts: tmk_core/doc/keymap.md
2016-04-21 14:37:16 +09:00 · 2016-04-21 14:37:16 +09:00 · 53bd4a01be
commit 53bd4a01be
parent 7613efca99 71381457fa
17 changed files with 372 additions and 67 deletions
--- a/tmk_core/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@ -10,6 +10,7 @@
 #include "action_layer.h"
 #include "eeconfig.h"
 #include "bootmagic.h"
+#include "hook.h"

 keymap_config_t keymap_config;

@ -41,6 +42,9 @@ void bootmagic(void)
        bootloader_jump();
    }

+    /* user-defined checks */
+    hook_bootmagic();
+
    /* debug enable */
    debug_config.raw = eeconfig_read_debug();
    if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_ENABLE)) {