1
0

Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu

This commit is contained in:
tmk 2015-01-19 10:19:47 +09:00
commit 36878f3c78
2 changed files with 4 additions and 1 deletions

View File

@ -54,6 +54,9 @@ You can find some keyboard specific projects under `converter` and `keyboard` di
* [KMAC](keyboard/kmac/) - Korean custom keyboard * [KMAC](keyboard/kmac/) - Korean custom keyboard
* [Lightsaber](keyboard/lightsaber/) - Korean custom keyboard * [Lightsaber](keyboard/lightsaber/) - Korean custom keyboard
* [Infinity](keyboard/infinity/) - Massdrop [Infinity keyboard][Infinity] * [Infinity](keyboard/infinity/) - Massdrop [Infinity keyboard][Infinity]
* [NerD](keyboard/nerd/) - Korean custom keyboard
* [KittenPaw](keyboard/kittenpaw) - Custom Majestouch controller
* [Lightpad](keyboard/lightpad) - Korean custom keypad
[GH_macway]: http://geekhack.org/showwiki.php?title=Island:11930 [GH_macway]: http://geekhack.org/showwiki.php?title=Island:11930
[GH_hhkb]: http://geekhack.org/showwiki.php?title=Island:12047 [GH_hhkb]: http://geekhack.org/showwiki.php?title=Island:12047

View File

@ -216,7 +216,7 @@ static bool command_common(uint8_t code)
print("C> "); print("C> ");
command_state = CONSOLE; command_state = CONSOLE;
break; break;
case KC_PAUSE: case KC_B:
clear_keyboard(); clear_keyboard();
print("\n\nJump to bootloader... "); print("\n\nJump to bootloader... ");
_delay_ms(1000); _delay_ms(1000);