diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-04-27 12:34:54 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-04-27 12:34:54 -0400 |
| commit | f59c4b03facd80cab913c6612a899392dd42ebb8 (patch) | |
| tree | a6f0bcb584fcc6e6cc31261bafdc4f43b2fa7dfc /tmk_core/common/keymap.c | |
| parent | 6ec6b613536b7138ee0c87002b10da8fe0c0117d (diff) | |
| parent | ce75a7675e10e24e7ecd7bc3575c0e0fc1bc34b5 (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 |