diff options
| author | Roman Zolotarev <hi@romanzolotarev.com> | 2016-04-26 16:23:10 +0800 |
|---|---|---|
| committer | Roman Zolotarev <hi@romanzolotarev.com> | 2016-04-26 16:23:10 +0800 |
| commit | 28f0b64e31b8c30a842dfd356421356cf0513177 (patch) | |
| tree | e5a76f4a2fb747c3599de1e297f46e4dc6fd4f0e /tmk_core/common/keymap.c | |
| parent | fa2eedb7bd906634b8c500ba0d91638e63eaafed (diff) | |
| parent | bf56838fe99aafd37559d560e47b707a83c87588 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keymap.c')
| -rw-r--r-- | tmk_core/common/keymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index 11f4aa8aaa..8955fc710d 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -22,7 +22,7 @@ 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); @@ -143,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 |