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/action_layer.c
+++ b/tmk_core/common/action_layer.c
@ -3,6 +3,7 @@
 #include "action.h"
 #include "util.h"
 #include "action_layer.h"
+#include "hook.h"

 #ifdef DEBUG_ACTION
 #include "debug.h"
@ -62,6 +63,7 @@ static void layer_state_set(uint32_t state)
    dprint("layer_state: ");
    layer_debug(); dprint(" to ");
    layer_state = state;
+    hook_layer_change(layer_state);
    layer_debug(); dprintln();
    clear_keyboard_but_mods(); // To avoid stuck keys
 }