diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-09-16 12:42:38 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-09-16 13:01:06 +0900 |
| commit | 498654fc4c693c8a40e9285063797b9a6324ac18 (patch) | |
| tree | 2ba448bd4da9713c2ce70ab96a706d568bb5bc8a | |
| parent | bb8c1d29fa123c430bccb5b8568d55a691bc1c81 (diff) | |
Change to KC_BOOTLOADER(KC_BTLD)
| -rw-r--r-- | tmk_core/common/keycode.h | 4 | ||||
| -rw-r--r-- | tmk_core/common/keymap.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index b2417a6c9d..448195306f 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -156,6 +156,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define KC_WSTP KC_WWW_STOP #define KC_WREF KC_WWW_REFRESH #define KC_WFAV KC_WWW_FAVORITES +/* Jump to bootloader */ +#define KC_BTLD KC_BOOTLOADER /* Transparent */ #define KC_TRANSPARENT 1 #define KC_TRNS KC_TRANSPARENT @@ -427,7 +429,7 @@ enum internal_special_keycodes { KC_MEDIA_REWIND, /* 0xBC */ /* Jump to bootloader */ - KC_RESET = 0xBF, + KC_BOOTLOADER = 0xBF, /* Fn key */ KC_FN0 = 0xC0, diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index bf7ddee792..d489238085 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -14,15 +14,14 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <util/delay.h> #include "keymap.h" #include "report.h" #include "keycode.h" #include "action_layer.h" #include "action.h" #include "action_macro.h" +#include "wait.h" #include "debug.h" -#include "print.h" static action_t keycode_to_action(uint8_t keycode); @@ -142,12 +141,10 @@ static action_t keycode_to_action(uint8_t keycode) case KC_TRNS: action.code = ACTION_TRANSPARENT; break; - case KC_RESET: + case KC_BOOTLOADER: clear_keyboard(); - print("\n\nJump to bootloader... "); - _delay_ms(50); - bootloader_jump(); - print("not supported.\n"); + wait_ms(50); + bootloader_jump(); // not return break; default: action.code = ACTION_NO; |