diff options
| author | Olivier <olivier@gid0.org> | 2016-04-17 19:54:06 +0200 |
|---|---|---|
| committer | Olivier <olivier@gid0.org> | 2016-04-17 19:54:06 +0200 |
| commit | b03a9f7252781b7fee75a684ba77650dc195dca5 (patch) | |
| tree | 43d6a80f4f4cf47c5f571397a0a17ec6e7ef0083 /tmk_core/common/keymap.c | |
| parent | 0715cf46ac369921fd39b1b62d8a95fc89d48244 (diff) | |
| parent | a67d425f4d5278595e7ab785a0f246b83fb1a09f (diff) | |
| download | firmware-b03a9f7252781b7fee75a684ba77650dc195dca5.tar.gz firmware-b03a9f7252781b7fee75a684ba77650dc195dca5.tar.bz2 firmware-b03a9f7252781b7fee75a684ba77650dc195dca5.zip | |
Merge 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 11f4aa8aa..8955fc710 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 |