di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

Change to KC_BOOTLOADER(KC_BTLD)

Browse Source
This commit is contained in:
tmk 2015-09-16 12:42:38 +09:00
parent bb8c1d29fa
commit 498654fc4c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/common/keycode.h
View File

@ -156,6 +156,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KC_WSTP KC_WWW_STOP #define KC_WSTP KC_WWW_STOP
#define KC_WREF KC_WWW_REFRESH #define KC_WREF KC_WWW_REFRESH
#define KC_WFAV KC_WWW_FAVORITES #define KC_WFAV KC_WWW_FAVORITES
/* Jump to bootloader */
#define KC_BTLD KC_BOOTLOADER
/* Transparent */ /* Transparent */
#define KC_TRANSPARENT 1 #define KC_TRANSPARENT 1
#define KC_TRNS KC_TRANSPARENT #define KC_TRNS KC_TRANSPARENT
@ -427,7 +429,7 @@ enum internal_special_keycodes {
KC_MEDIA_REWIND, /* 0xBC */ KC_MEDIA_REWIND, /* 0xBC */
/* Jump to bootloader */ /* Jump to bootloader */
KC_RESET = 0xBF, KC_BOOTLOADER = 0xBF,
/* Fn key */ /* Fn key */
KC_FN0 = 0xC0, KC_FN0 = 0xC0,

11
tmk_core/common/keymap.c
View File

@ -14,15 +14,14 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <util/delay.h>
#include "keymap.h" #include "keymap.h"
#include "report.h" #include "report.h"
#include "keycode.h" #include "keycode.h"
#include "action_layer.h" #include "action_layer.h"
#include "action.h" #include "action.h"
#include "action_macro.h" #include "action_macro.h"
#include "wait.h"
#include "debug.h" #include "debug.h"
#include "print.h"
static action_t keycode_to_action(uint8_t keycode); 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: case KC_TRNS:
action.code = ACTION_TRANSPARENT; action.code = ACTION_TRANSPARENT;
break; break;
case KC_RESET: case KC_BOOTLOADER:
clear_keyboard(); clear_keyboard();
print("\n\nJump to bootloader... "); wait_ms(50);
_delay_ms(50); bootloader_jump(); // not return
bootloader_jump();
print("not supported.\n");
break; break;
default: default:
action.code = ACTION_NO; action.code = ACTION_NO;