Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

[qmk_firmware.git] / tmk_core / common / keymap.c

diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c
index d4892380854486bb25d1c8abd3c7a95d7786e381..8955fc710d518665a7a9298afb12d7f2716cec65 100644 (file)
--- a/tmk_core/common/keymap.c
+++ b/tmk_core/common/keymap.c
@@ -22,12 +22,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_macro.h"
 #include "wait.h"
 #include "debug.h"
-
+#include "bootloader.h"
 
 static action_t keycode_to_action(uint8_t keycode);
 
 
 /* converts key to action */
+__attribute__ ((weak))
 action_t action_for_key(uint8_t layer, keypos_t key)
 {
     uint8_t keycode = keymap_key_to_keycode(layer, key);
@@ -142,6 +143,7 @@ static action_t keycode_to_action(uint8_t keycode)
             action.code = ACTION_TRANSPARENT;
             break;
         case KC_BOOTLOADER:
+               action.code = ACTION_NO;
             clear_keyboard();
             wait_ms(50);
             bootloader_jump(); // not return