From 7c3f14b7bbc155a74162a28c0eb82c3f4c39a54b Mon Sep 17 00:00:00 2001 From: Jun Wako Date: Thu, 23 Apr 2015 17:02:28 +0900 Subject: Fix handling of consumer usage #199 --- tmk_core/common/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tmk_core/common/keymap.c') diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index 4c0b61b8c..9f4fab521 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -131,7 +131,7 @@ static action_t keycode_to_action(uint8_t keycode) case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE: action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode)); break; - case KC_AUDIO_MUTE ... KC_WWW_FAVORITES: + case KC_AUDIO_MUTE ... KC_MEDIA_REWIND: action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode)); break; case KC_MS_UP ... KC_MS_ACCEL2: -- cgit v1.2.3-70-g09d2 From c17b8a599e3ec3b0a327bcd66082541f2517ab30 Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Tue, 19 May 2015 11:29:28 -0700 Subject: Make action_for_key a weak symbol --- tmk_core/common/action.h | 1 + tmk_core/common/keymap.c | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'tmk_core/common/keymap.c') diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index 8a4736d7b..e76161c17 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h @@ -51,6 +51,7 @@ void action_exec(keyevent_t event); /* action for key */ action_t action_for_key(uint8_t layer, keypos_t key); +action_t action_for_key_default(uint8_t layer, keypos_t key); /* macro */ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt); diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index 9f4fab521..a43ca460f 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -27,8 +27,13 @@ static action_t keycode_to_action(uint8_t keycode); /* converts key to action */ +__attribute__((__weak__)) action_t action_for_key(uint8_t layer, keypos_t key) { + return action_for_key_default(layer, key); +} + +action_t action_for_key_default(uint8_t layer, keypos_t key) uint8_t keycode = keymap_key_to_keycode(layer, key); switch (keycode) { case KC_FN0 ... KC_FN31: -- cgit v1.2.3-70-g09d2 From 5b46031658a69104526ef43284acd943ba21b772 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 21 May 2015 20:30:10 +0900 Subject: Revert "Make action_for_key a weak symbol" This reverts commit c17b8a599e3ec3b0a327bcd66082541f2517ab30. The commit made compile error and its intention is unclear. --- tmk_core/common/action.h | 1 - tmk_core/common/keymap.c | 5 ----- 2 files changed, 6 deletions(-) (limited to 'tmk_core/common/keymap.c') diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index e76161c17..8a4736d7b 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h @@ -51,7 +51,6 @@ void action_exec(keyevent_t event); /* action for key */ action_t action_for_key(uint8_t layer, keypos_t key); -action_t action_for_key_default(uint8_t layer, keypos_t key); /* macro */ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt); diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index a43ca460f..9f4fab521 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -27,13 +27,8 @@ static action_t keycode_to_action(uint8_t keycode); /* converts key to action */ -__attribute__((__weak__)) action_t action_for_key(uint8_t layer, keypos_t key) { - return action_for_key_default(layer, key); -} - -action_t action_for_key_default(uint8_t layer, keypos_t key) uint8_t keycode = keymap_key_to_keycode(layer, key); switch (keycode) { case KC_FN0 ... KC_FN31: -- cgit v1.2.3-70-g09d2 From bb8c1d29fa123c430bccb5b8568d55a691bc1c81 Mon Sep 17 00:00:00 2001 From: skullY Date: Tue, 15 Sep 2015 09:17:02 -0700 Subject: Add an assignable RESET key --- tmk_core/common/keycode.h | 3 +++ tmk_core/common/keymap.c | 9 +++++++++ 2 files changed, 12 insertions(+) (limited to 'tmk_core/common/keymap.c') diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index fc66dc0ef..b2417a6c9 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -426,6 +426,9 @@ enum internal_special_keycodes { KC_MEDIA_FAST_FORWARD, KC_MEDIA_REWIND, /* 0xBC */ + /* Jump to bootloader */ + KC_RESET = 0xBF, + /* Fn key */ KC_FN0 = 0xC0, KC_FN1, diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index 9f4fab521..bf7ddee79 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c @@ -14,6 +14,7 @@ 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 . */ +#include #include "keymap.h" #include "report.h" #include "keycode.h" @@ -21,6 +22,7 @@ along with this program. If not, see . #include "action.h" #include "action_macro.h" #include "debug.h" +#include "print.h" static action_t keycode_to_action(uint8_t keycode); @@ -140,6 +142,13 @@ static action_t keycode_to_action(uint8_t keycode) case KC_TRNS: action.code = ACTION_TRANSPARENT; break; + case KC_RESET: + clear_keyboard(); + print("\n\nJump to bootloader... "); + _delay_ms(50); + bootloader_jump(); + print("not supported.\n"); + break; default: action.code = ACTION_NO; break; -- cgit v1.2.3-70-g09d2 From 498654fc4c693c8a40e9285063797b9a6324ac18 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 16 Sep 2015 12:42:38 +0900 Subject: Change to KC_BOOTLOADER(KC_BTLD) --- tmk_core/common/keycode.h | 4 +++- tmk_core/common/keymap.c | 11 ++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tmk_core/common/keymap.c') diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index b2417a6c9..448195306 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -156,6 +156,8 @@ along with this program. If not, see . #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 bf7ddee79..d48923808 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 . */ -#include #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; -- cgit v1.2.3-70-g09d2