summaryrefslogtreecommitdiff
path: root/common/keymap.c
diff options
context:
space:
mode:
authorJun Wako2015-09-24 12:29:11 +0900
committerJun Wako2015-09-24 12:29:11 +0900
commitfdc38ef3f92af7adeeb4de49550d8838c8a39b5c (patch)
treea20c7a06111e5f674d94e8ba48a82d16b2e3e07f /common/keymap.c
parentf6d56675f9f981c5464f0ca7a1fbb0162154e8c5 (diff)
Squashed 'tmk_core/' changes from dc0e46e..57d27a8
57d27a8 Merge branch 'core_update_150924' into core 024abe3 core: Fix NKRO ifdef 7aa2d30 core: Fix for disabling NKRO in Boot protocol 95651fd core: Fix message print of debug command c20cd29 lufa: Fix endpoint bank mode for ATMega32u2 82ac21f next_usb: Fix next_kbd_set_leds() 537d9c7 Change to KC_BOOTLOADER(KC_BTLD) f2b3772 Add an assignable RESET key fc99257 Fix parenthesis e852582 Fix weak modifier clear in action macro c2a6c5c core: Fix lufa suspend callback(#234) fa548c5 usb_usb: Ignore error usage(0x01-03) report 513d95c usb_usb: Support locking key indicator LED cd78802 core: Add keymap section ldscript for ATMega32U2 70c9abd Add description for non-US keys on keycode.h 538c192 lufa: Fix console flush #223 87628c9 Revert "Make action_for_key a weak symbol" 3c0a1ba Make action_for_key a weak symbol 6bb0d7d ibm4704_usb: Fix protocol handling b6ef5cf Add keyboard_setup() and matrix_setup() f4bb8b2 ibm4704_usb: Fix interrupt of clock(rising edge) 0c1fcc1 usb_usb: Change debug LED pin config 595710d Reduce code size of magic commands 6bed174 Add description of AVR bootloader and boot section 54c6a01 Merge commit 'f6d56675f9f981c5464f0ca7a1fbb0162154e8c5' d18d42e Merge branch 'core-update2' into core febec88 Add compile options '-fdata-sections' git-subtree-dir: tmk_core git-subtree-split: 57d27a8e39173a589b4abae74851f95c39940174
Diffstat (limited to 'common/keymap.c')
-rw-r--r--common/keymap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/keymap.c b/common/keymap.c
index 9f4fab521..d48923808 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_layer.h"
#include "action.h"
#include "action_macro.h"
+#include "wait.h"
#include "debug.h"
@@ -140,6 +141,11 @@ static action_t keycode_to_action(uint8_t keycode)
case KC_TRNS:
action.code = ACTION_TRANSPARENT;
break;
+ case KC_BOOTLOADER:
+ clear_keyboard();
+ wait_ms(50);
+ bootloader_jump(); // not return
+ break;
default:
action.code = ACTION_NO;
break;