diff options
| author | Stephan Bösebeck <sb@caluga.de> | 2016-04-14 21:47:33 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <sb@caluga.de> | 2016-04-14 21:47:33 +0200 |
| commit | 990254edecab782d6f2e71ebfc0b0dda4dc0781e (patch) | |
| tree | 5b8f107ef8212a858d3137c3304da743813b1a09 /tmk_core/common/keymap.c | |
| parent | a71ab3ebb6ef3390a9eb20ba7d0a8a3c7ab6a18f (diff) | |
| parent | bdb6dceaebc358dd4aae593d51d3ba0dd61858a9 (diff) | |
| download | qmk_firmware-990254edecab782d6f2e71ebfc0b0dda4dc0781e.tar.gz qmk_firmware-990254edecab782d6f2e71ebfc0b0dda4dc0781e.zip | |
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 |