diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-09-16 13:07:35 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-09-16 13:07:35 +0900 |
| commit | 6147f5705ad2c5195a6363b4a1469230b424e489 (patch) | |
| tree | c06d52212f67e20bb331602292ca762b0c5ba396 /tmk_core/common/keymap.c | |
| parent | dc04983fd7905048c94366bce70f1288b323bfc9 (diff) | |
| parent | 498654fc4c693c8a40e9285063797b9a6324ac18 (diff) | |
| download | firmware-6147f5705ad2c5195a6363b4a1469230b424e489.tar.gz firmware-6147f5705ad2c5195a6363b4a1469230b424e489.tar.bz2 firmware-6147f5705ad2c5195a6363b4a1469230b424e489.zip | |
Merge branch 'skullydazed-assignable_RESET'
Diffstat (limited to 'tmk_core/common/keymap.c')
| -rw-r--r-- | tmk_core/common/keymap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index 9f4fab521..d48923808 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/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; |